[RFC PATCH 00/12] Merge common OpenFirmware device tree code

[Grant Likely]

On Wed, Oct 14, 2009 at 7:00 PM, Stephen Rothwell <sfr at canb.auug.org.au> wrote:
> Hi Grant,
>
> On Tue, 06 Oct 2009 22:29:57 -0600 Grant Likely <grant.likely at secretlab.ca> wrote:
>>
>> Well, I've got to start somewhere...
>>
>> So here goes.  I've begun the work to merge and clean up the OF device
>> tree handling code and this is my first set of patches.  Not fully
>> tested yet, but I'm getting them out to the lists so that I can start
>> responding to comments and collecting acks.  This first batch isn't
>> anything exciting, just a merge of common code
>
> This all looks OK to me.  One thing:  I started in this as well some time
> ago and in my attempt I was hoping to avoid the ARCH ifdefs in linux/of.h
> by creating asm/of.h and moving the differing bits in there ...

Thanks Stephen.

At the moment I'm purposefully experimenting with doing arch #ifdefs
in the hope that it will lead to obvious places where the code can be
generalized even further.  I'll see how it looks before I commit down
that path though.

In the mean time, I've pushed out the current series with acked-bys
added to my git server.  I think I'm ready for things to start going
into linux-next.  Since this is the first time I've asked for a tree
to be added to linux-next, please let me know if you see anything
troublesome or problematic.  Here's the tree:

The following changes since commit 4bdf0bb7d64cf672199519b3d808e2a82f5b59e9:
  Grant Likely (1):
        powerpc/5200: Update defconfigs

are available in the git repository at:

  git://git.secretlab.ca/git/linux-2.6 next-devicetree

Grant Likely (12):
      of: Rework linux/of.h and asm/prom.h include ordering
      of: merge phandle, ihandle and struct property
      of: merge struct device_node
      of: Move OF_IS_DYNAMIC and OF_MARK_DYNAMIC macros to of.h
      of: add common header for flattened device tree representation
      of: merge struct boot_param_header from Microblaze and PowerPC
      of: merge of_node_*_flag() and set_node_proc_entry()
      of: merge of_read_number() an of_read_ulong()
      of: merge of_node_get(), of_node_put() and of_find_all_nodes()
      of: merge of_*_flat_dt*() functions
      of: merge other miscellaneous prototypes
      of: merge of_find_all_nodes() implementations

 arch/microblaze/include/asm/prom.h |  135 +--------------------------------
 arch/microblaze/kernel/head.S      |    2 +-
 arch/microblaze/kernel/prom.c      |   23 ------
 arch/powerpc/include/asm/prom.h    |  147 +-----------------------------------
 arch/powerpc/kernel/prom.c         |   23 ------
 arch/sparc/include/asm/prom.h      |   55 +-------------
 drivers/of/base.c                  |   26 ++++++-
 include/linux/of.h                 |  103 +++++++++++++++++++++++++
 include/linux/of_fdt.h             |   86 +++++++++++++++++++++
 9 files changed, 221 insertions(+), 379 deletions(-)
 create mode 100644 include/linux/of_fdt.h


> I'll send out the two patches I did just to show what I mean (these are
> from before microblaze was using the OF stuff).

Got them, thanks.

g.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.