From: Grant Likely <grant.likely@secretlab.ca> To: linuxppc-dev@lists.ozlabs.org, benh@kernel.crashing.org, Stephen Rothwell <sfr@canb.auug.org.au>, davem@davemloft.net, sparclinux@vger.kernel.org, monstr@monstr.eu, microblaze-uclinux@itee.uq.edu.au, devicetree-discuss@lists.ozlabs.org Subject: [RFC PATCH 10/12] of: merge of_*_flat_dt*() functions Date: Wed, 07 Oct 2009 04:32:02 +0000 [thread overview] Message-ID: <20091007043154.16890.18883.stgit@angua> (raw) In-Reply-To: <20091007041007.16890.62194.stgit@angua> Merge common flattened device tree code between Microblaze and PowerPC Signed-off-by: Grant Likely <grant.likely@secretlab.ca> --- arch/microblaze/include/asm/prom.h | 11 ----------- arch/powerpc/include/asm/prom.h | 10 ---------- include/linux/of_fdt.h | 14 ++++++++++++++ 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h index c92b4a9..be4db2a 100644 --- a/arch/microblaze/include/asm/prom.h +++ b/arch/microblaze/include/asm/prom.h @@ -40,17 +40,6 @@ extern struct device_node *of_chosen; extern struct device_node *allnodes; /* temporary while merging */ extern rwlock_t devtree_lock; /* temporary while merging */ -/* For scanning the flat device-tree at boot time */ -extern int __init of_scan_flat_dt(int (*it)(unsigned long node, - const char *uname, int depth, - void *data), - void *data); -extern void *__init of_get_flat_dt_prop(unsigned long node, const char *name, - unsigned long *size); -extern int __init - of_flat_dt_is_compatible(unsigned long node, const char *name); -extern unsigned long __init of_get_flat_dt_root(void); - /* For updating the device tree at runtime */ extern void of_attach_node(struct device_node *); extern void of_detach_node(struct device_node *); diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h index 622769c..c8b5933 100644 --- a/arch/powerpc/include/asm/prom.h +++ b/arch/powerpc/include/asm/prom.h @@ -34,16 +34,6 @@ extern struct device_node *of_chosen; #define HAVE_ARCH_DEVTREE_FIXUPS -/* For scanning the flat device-tree at boot time */ -extern int __init of_scan_flat_dt(int (*it)(unsigned long node, - const char *uname, int depth, - void *data), - void *data); -extern void* __init of_get_flat_dt_prop(unsigned long node, const char *name, - unsigned long *size); -extern int __init of_flat_dt_is_compatible(unsigned long node, const char *name); -extern unsigned long __init of_get_flat_dt_root(void); - /* For updating the device tree at runtime */ extern void of_attach_node(struct device_node *); extern void of_detach_node(struct device_node *); diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h index 8b87bcb..ac31d4f 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h @@ -16,6 +16,9 @@ #ifndef _LINUX_OF_FDT_H #define _LINUX_OF_FDT_H +#include <linux/types.h> +#include <linux/init.h> + /* Definitions used by the flattened device tree */ #define OF_DT_HEADER 0xd00dfeed /* marker */ #define OF_DT_BEGIN_NODE 0x1 /* Start of node, full name */ @@ -57,4 +60,15 @@ struct boot_param_header { u32 dt_struct_size; /* size of the DT structure block */ }; +/* For scanning the flat device-tree at boot time */ +extern int __init of_scan_flat_dt(int (*it)(unsigned long node, + const char *uname, int depth, + void *data), + void *data); +extern void __init *of_get_flat_dt_prop(unsigned long node, const char *name, + unsigned long *size); +extern int __init of_flat_dt_is_compatible(unsigned long node, + const char *name); +extern unsigned long __init of_get_flat_dt_root(void); + #endif /* _LINUX_OF_FDT_H */
WARNING: multiple messages have this Message-ID (diff)
From: Grant Likely <grant.likely@secretlab.ca> To: linuxppc-dev@lists.ozlabs.org, benh@kernel.crashing.org, Stephen Rothwell <sfr@canb.auug.org.au>, davem@davemloft.net, sparclinux@vger.kernel.org, monstr@monstr.eu, microblaze-uclinux@itee.uq.edu.au, devicetree-discuss@lists.ozlabs.org Subject: [RFC PATCH 10/12] of: merge of_*_flat_dt*() functions Date: Tue, 06 Oct 2009 22:32:02 -0600 [thread overview] Message-ID: <20091007043154.16890.18883.stgit@angua> (raw) In-Reply-To: <20091007041007.16890.62194.stgit@angua> Merge common flattened device tree code between Microblaze and PowerPC Signed-off-by: Grant Likely <grant.likely@secretlab.ca> --- arch/microblaze/include/asm/prom.h | 11 ----------- arch/powerpc/include/asm/prom.h | 10 ---------- include/linux/of_fdt.h | 14 ++++++++++++++ 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h index c92b4a9..be4db2a 100644 --- a/arch/microblaze/include/asm/prom.h +++ b/arch/microblaze/include/asm/prom.h @@ -40,17 +40,6 @@ extern struct device_node *of_chosen; extern struct device_node *allnodes; /* temporary while merging */ extern rwlock_t devtree_lock; /* temporary while merging */ -/* For scanning the flat device-tree at boot time */ -extern int __init of_scan_flat_dt(int (*it)(unsigned long node, - const char *uname, int depth, - void *data), - void *data); -extern void *__init of_get_flat_dt_prop(unsigned long node, const char *name, - unsigned long *size); -extern int __init - of_flat_dt_is_compatible(unsigned long node, const char *name); -extern unsigned long __init of_get_flat_dt_root(void); - /* For updating the device tree at runtime */ extern void of_attach_node(struct device_node *); extern void of_detach_node(struct device_node *); diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h index 622769c..c8b5933 100644 --- a/arch/powerpc/include/asm/prom.h +++ b/arch/powerpc/include/asm/prom.h @@ -34,16 +34,6 @@ extern struct device_node *of_chosen; #define HAVE_ARCH_DEVTREE_FIXUPS -/* For scanning the flat device-tree at boot time */ -extern int __init of_scan_flat_dt(int (*it)(unsigned long node, - const char *uname, int depth, - void *data), - void *data); -extern void* __init of_get_flat_dt_prop(unsigned long node, const char *name, - unsigned long *size); -extern int __init of_flat_dt_is_compatible(unsigned long node, const char *name); -extern unsigned long __init of_get_flat_dt_root(void); - /* For updating the device tree at runtime */ extern void of_attach_node(struct device_node *); extern void of_detach_node(struct device_node *); diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h index 8b87bcb..ac31d4f 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h @@ -16,6 +16,9 @@ #ifndef _LINUX_OF_FDT_H #define _LINUX_OF_FDT_H +#include <linux/types.h> +#include <linux/init.h> + /* Definitions used by the flattened device tree */ #define OF_DT_HEADER 0xd00dfeed /* marker */ #define OF_DT_BEGIN_NODE 0x1 /* Start of node, full name */ @@ -57,4 +60,15 @@ struct boot_param_header { u32 dt_struct_size; /* size of the DT structure block */ }; +/* For scanning the flat device-tree at boot time */ +extern int __init of_scan_flat_dt(int (*it)(unsigned long node, + const char *uname, int depth, + void *data), + void *data); +extern void __init *of_get_flat_dt_prop(unsigned long node, const char *name, + unsigned long *size); +extern int __init of_flat_dt_is_compatible(unsigned long node, + const char *name); +extern unsigned long __init of_get_flat_dt_root(void); + #endif /* _LINUX_OF_FDT_H */
next prev parent reply other threads:[~2009-10-07 4:32 UTC|newest] Thread overview: 136+ messages / expand[flat|nested] mbox.gz Atom feed top 2009-10-07 4:29 [RFC PATCH 00/12] Merge common OpenFirmware device tree code Grant Likely 2009-10-07 4:29 ` Grant Likely 2009-10-07 4:30 ` [RFC PATCH 01/12] of: Rework linux/of.h and asm/prom.h include ordering Grant Likely 2009-10-07 4:30 ` Grant Likely 2009-10-07 4:30 ` [RFC PATCH 01/12] of: Rework linux/of.h and asm/prom.h include Grant Likely 2009-10-07 4:30 ` [RFC PATCH 02/12] of: merge phandle, ihandle and struct property Grant Likely 2009-10-07 4:30 ` Grant Likely 2009-10-07 4:30 ` Grant Likely 2009-10-07 4:30 ` [RFC PATCH 03/12] of: merge struct device_node Grant Likely 2009-10-07 4:30 ` Grant Likely 2009-10-07 4:30 ` Grant Likely 2009-10-07 4:30 ` [RFC PATCH 04/12] of: Move OF_IS_DYNAMIC and OF_MARK_DYNAMIC macros to of.h Grant Likely 2009-10-07 4:30 ` [RFC PATCH 04/12] of: Move OF_IS_DYNAMIC and OF_MARK_DYNAMIC macros Grant Likely 2009-10-07 4:30 ` [RFC PATCH 04/12] of: Move OF_IS_DYNAMIC and OF_MARK_DYNAMIC macros to of.h Grant Likely 2009-10-07 4:30 ` [RFC PATCH 05/12] of: add common header for flattened device tree Grant Likely 2009-10-07 4:30 ` [RFC PATCH 05/12] of: add common header for flattened device tree representation Grant Likely 2009-10-07 4:57 ` Stephen Rothwell 2009-10-07 4:57 ` Stephen Rothwell 2009-10-07 4:57 ` [RFC PATCH 05/12] of: add common header for flattened device Stephen Rothwell 2009-10-07 12:14 ` [microblaze-uclinux] Re: [RFC PATCH 05/12] of: add common header for flattened device tree representation Michal Simek 2009-10-07 12:14 ` Michal Simek 2009-10-07 12:14 ` [microblaze-uclinux] Re: [RFC PATCH 05/12] of: add common header Michal Simek [not found] ` <4ACC861A.7020506-pSz03upnqPeHXe+LvDLADg@public.gmane.org> 2009-10-07 13:38 ` [microblaze-uclinux] Re: [RFC PATCH 05/12] of: add common header for flattened device tree representation Grant Likely 2009-10-07 13:38 ` Grant Likely 2009-10-07 13:38 ` [microblaze-uclinux] Re: [RFC PATCH 05/12] of: add common header Grant Likely 2009-10-07 14:07 ` [microblaze-uclinux] Re: [RFC PATCH 05/12] of: add common header for flattened device tree representation Michal Simek 2009-10-07 14:07 ` [microblaze-uclinux] Re: [RFC PATCH 05/12] of: add common header Michal Simek 2009-10-07 5:14 ` [RFC PATCH 05/12] of: add common header for flattened device tree representation Benjamin Herrenschmidt 2009-10-07 5:14 ` Benjamin Herrenschmidt 2009-10-07 5:14 ` [RFC PATCH 05/12] of: add common header for flattened device Benjamin Herrenschmidt 2009-10-07 13:41 ` [RFC PATCH 05/12] of: add common header for flattened device tree representation Grant Likely 2009-10-07 13:41 ` Grant Likely 2009-10-07 13:41 ` [RFC PATCH 05/12] of: add common header for flattened device tree Grant Likely 2009-10-09 6:35 ` [RFC PATCH 05/12] of: add common header for flattened device tree representation David Gibson 2009-10-09 6:35 ` David Gibson 2009-10-09 6:35 ` [RFC PATCH 05/12] of: add common header for flattened device David Gibson [not found] ` <20091009063534.GC12948-787xzQ0H9iRg7VrjXcPTGA@public.gmane.org> 2009-10-09 7:07 ` [RFC PATCH 05/12] of: add common header for flattened device tree representation Grant Likely 2009-10-09 7:07 ` Grant Likely 2009-10-09 7:07 ` [RFC PATCH 05/12] of: add common header for flattened device tree Grant Likely [not found] ` <fa686aa40910090007lef3fddbod0c5843abfe33be5-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2009-10-14 4:47 ` [RFC PATCH 05/12] of: add common header for flattened device tree representation David Gibson 2009-10-14 4:47 ` David Gibson 2009-10-14 4:47 ` [RFC PATCH 05/12] of: add common header for flattened device David Gibson 2009-10-07 4:30 ` [RFC PATCH 05/12] of: add common header for flattened device tree representation Grant Likely 2009-10-07 4:31 ` [RFC PATCH 06/12] of: merge struct boot_param_header from Microblaze and PowerPC Grant Likely 2009-10-07 4:31 ` [RFC PATCH 06/12] of: merge struct boot_param_header from Microblaze Grant Likely 2009-10-07 4:31 ` [RFC PATCH 06/12] of: merge struct boot_param_header from Microblaze and PowerPC Grant Likely 2009-10-07 4:31 ` [RFC PATCH 07/12] of: merge of_node_*_flag() and set_node_proc_entry() Grant Likely 2009-10-07 4:31 ` Grant Likely 2009-10-07 4:31 ` Grant Likely 2009-10-07 4:31 ` [RFC PATCH 08/12] of: merge of_read_number() an of_read_ulong() Grant Likely 2009-10-07 4:31 ` Grant Likely 2009-10-07 4:31 ` Grant Likely 2009-10-07 4:31 ` [RFC PATCH 09/12] of: merge of_node_get(), Grant Likely 2009-10-07 4:31 ` [RFC PATCH 09/12] of: merge of_node_get(), of_node_put() and of_find_all_nodes() Grant Likely 2009-10-07 4:31 ` Grant Likely 2009-10-07 4:32 ` Grant Likely [this message] 2009-10-07 4:32 ` [RFC PATCH 10/12] of: merge of_*_flat_dt*() functions Grant Likely 2009-10-09 6:36 ` David Gibson 2009-10-09 6:36 ` David Gibson 2009-10-09 6:36 ` David Gibson [not found] ` <20091009063635.GD12948-787xzQ0H9iRg7VrjXcPTGA@public.gmane.org> 2009-10-09 7:03 ` Grant Likely 2009-10-09 7:03 ` Grant Likely 2009-10-09 7:03 ` Grant Likely 2009-10-07 4:32 ` Grant Likely 2009-10-07 4:32 ` [RFC PATCH 11/12] of: merge other miscellaneous prototypes Grant Likely 2009-10-07 4:32 ` Grant Likely 2009-10-07 4:32 ` Grant Likely 2009-10-07 4:32 ` [RFC PATCH 12/12] of: merge of_find_all_nodes() implementations Grant Likely 2009-10-07 4:32 ` Grant Likely 2009-10-07 4:32 ` Grant Likely 2009-10-07 4:49 ` [RFC PATCH 00/12] Merge common OpenFirmware device tree code Grant Likely 2009-10-07 4:49 ` Grant Likely 2009-10-07 4:49 ` Grant Likely 2009-10-07 5:18 ` Julian Calaby 2009-10-07 5:18 ` Julian Calaby 2009-10-07 5:18 ` Julian Calaby [not found] ` <646765f40910062218s19d540f9q14c9086bedd1d9da-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2009-10-07 13:52 ` Sam Creasey 2009-10-07 13:52 ` Sam Creasey 2009-10-07 13:52 ` Sam Creasey 2009-10-07 19:30 ` Mitch Bradley 2009-10-07 19:30 ` Mitch Bradley 2009-10-07 19:30 ` Mitch Bradley [not found] ` <4ACCEC67.9070106-D5eQfiDGL7eakBO8gow8eQ@public.gmane.org> 2009-10-07 20:54 ` Chris Newport 2009-10-07 20:54 ` Chris Newport 2009-10-07 20:54 ` Chris Newport [not found] ` <Pine.LNX.4.60.0910072148040.11795-pb599fR3TxWvwYtD5Hs6llaTQe2KTcn/@public.gmane.org> 2009-10-07 21:09 ` David Miller 2009-10-07 21:09 ` David Miller 2009-10-07 21:09 ` David Miller 2009-10-08 1:29 ` Chris Newport 2009-10-08 1:29 ` Chris Newport [not found] ` <Pine.LNX.4.60.0910080155210.12519-pb599fR3TxWvwYtD5Hs6llaTQe2KTcn/@public.gmane.org> 2009-10-08 4:39 ` David Miller 2009-10-08 4:39 ` David Miller 2009-10-08 4:39 ` David Miller [not found] ` <20091007.213915.37481688.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> 2009-10-08 13:24 ` Kjetil Oftedal 2009-10-08 13:24 ` Kjetil Oftedal 2009-10-08 13:24 ` Kjetil Oftedal 2009-10-07 22:57 ` Brad Boyer 2009-10-07 22:57 ` Brad Boyer [not found] ` <fa686aa40910062149p5d7141e4x3ff849fd4d191f38-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2009-10-07 7:09 ` Rob Landley 2009-10-07 7:09 ` Rob Landley 2009-10-07 7:09 ` Rob Landley 2009-10-07 14:02 ` Grant Likely 2009-10-07 14:02 ` Grant Likely 2009-10-07 14:02 ` Grant Likely [not found] ` <fa686aa40910070702j470785d2ka2621122a8e2f1fd-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2009-10-07 14:21 ` [microblaze-uclinux] " Michal Simek 2009-10-07 14:21 ` Michal Simek 2009-10-07 14:21 ` [microblaze-uclinux] Re: [RFC PATCH 00/12] Merge common OpenFirmware Michal Simek 2009-10-07 7:27 ` [RFC PATCH 00/12] Merge common OpenFirmware device tree code David Miller 2009-10-07 7:27 ` David Miller 2009-10-07 7:27 ` David Miller [not found] ` <20091007.002722.168292120.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> 2009-10-07 16:39 ` Stephen Neuendorffer 2009-10-07 16:39 ` Stephen Neuendorffer 2009-10-07 16:39 ` Stephen Neuendorffer 2009-10-07 9:02 ` Wolfram Sang 2009-10-07 9:02 ` Wolfram Sang 2009-10-07 9:02 ` Wolfram Sang 2009-10-07 22:20 ` Leif Sawyer 2009-10-07 22:39 ` David Miller 2009-10-07 22:50 ` Mitch Bradley 2009-10-15 1:00 ` Stephen Rothwell 2009-10-15 1:00 ` Stephen Rothwell 2009-10-15 1:00 ` Stephen Rothwell [not found] ` <20091015120007.3780c59b.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> 2009-10-15 1:01 ` [PATCH 1/2] of: create asm/of.h Stephen Rothwell 2009-10-15 1:01 ` Stephen Rothwell 2009-10-15 1:01 ` Stephen Rothwell 2009-10-15 1:02 ` [PATCH 2/2] of: move struct property to asm/of.h Stephen Rothwell 2009-10-15 1:02 ` Stephen Rothwell 2009-10-15 17:06 ` [RFC PATCH 00/12] Merge common OpenFirmware device tree code Grant Likely 2009-10-15 17:06 ` Grant Likely 2009-10-15 17:06 ` Grant Likely [not found] ` <fa686aa40910151006k43b07c30q1e43c3b1ae4af561-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2009-10-15 23:38 ` Stephen Rothwell 2009-10-15 23:38 ` Stephen Rothwell 2009-10-15 23:38 ` Stephen Rothwell [not found] ` <20091016103829.323c89d7.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> 2009-10-16 3:18 ` Grant Likely 2009-10-16 3:18 ` Grant Likely 2009-10-16 3:18 ` Grant Likely
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20091007043154.16890.18883.stgit@angua \ --to=grant.likely@secretlab.ca \ --cc=benh@kernel.crashing.org \ --cc=davem@davemloft.net \ --cc=devicetree-discuss@lists.ozlabs.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=microblaze-uclinux@itee.uq.edu.au \ --cc=monstr@monstr.eu \ --cc=sfr@canb.auug.org.au \ --cc=sparclinux@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.