Skip to contentSkip to conversation

OF device tree rework for 2.6.33

GIT PULL Grant Likely 1 participant 1 message Dec 3, 2009

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Here is my first batch of rework commits for the OF device tree support code. This is the first time I'm getting you to pull directly and it involves cross architecture code (SPARC, ppc & microblaze), so I'm starting with a small batch of the changes to avoid stupid breakage. Everything is signed off correctly, and sfr has been pulling it into linux-next for some weeks now.

Let me know if you need me to change anything.

The following changes since commit 22763c5cf3690a681551162c15d34d935308c8d7:
Linus Torvalds (1):

        Linux 2.6.32

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
Signature · 2 lines
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.