Skip to content

Yet another series of OF merge patches.

Grant Likely linux-devicetree linuxppc-dev sparclinux 1 version In review

Get series with b4
b4 am 20091124081316.6216.66310.stgit@angua

Versions newest first

  1. v1 Latest11 patches 30 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/11of/flattree: Merge early_init_dt_check_for_initrd()arch/microblaze/kernel/prom.c arch/powerpc/kernel/prom.c drivers/of/fdt.c +1 more+38 -622 replies
2/11of/flattree: Merge earlyinit_dt_scan_root()arch/microblaze/kernel/prom.c arch/powerpc/kernel/prom.c drivers/of/fdt.c +1 more+32 -472 replies
3/11of/flattree: merge dt_mem_next_cellarch/microblaze/kernel/prom.c arch/powerpc/kernel/prom.c drivers/of/fdt.c +1 more+9 -161 reply
4/11of/flattree: eliminate cell_t typedefarch/microblaze/kernel/prom.c arch/powerpc/kernel/prom.c+10 -1410 replies
5/11of/flattree: merge early_init_dt_scan_chosen()arch/microblaze/kernel/prom.c arch/powerpc/kernel/prom.c drivers/of/fdt.c +1 more+53 -780 replies
6/11of/flattree: merge early_init_devtree() and early_init_move_devtree()arch/microblaze/kernel/prom.c arch/powerpc/kernel/prom.c drivers/of/fdt.c +1 more+115 -1314 replies
7/11of: merge machine_is_compatible()arch/microblaze/kernel/prom.c arch/powerpc/kernel/prom.c drivers/of/base.c+18 -362 replies
8/11of: Merge of_node_get() and of_node_put()arch/microblaze/kernel/prom.c arch/powerpc/kernel/prom.c drivers/of/base.c+75 -1471 reply
9/11of: merge of_attach_node() & of_detach_node()arch/microblaze/include/asm/prom.h arch/microblaze/kernel/prom.c arch/powerpc/include/asm/prom.h +3 more+64 -1262 replies
10/11microblaze: gut implementation of early_init_dt_scan_cpus()arch/microblaze/kernel/prom.c+0 -540 replies
11/11of: unify phandle name in struct device_nodearch/powerpc/platforms/powermac/pfunc_core.c arch/sparc/kernel/devices.c arch/sparc/kernel/of_device_32.c +7 more+16 -205 replies

Reviews trailers per patch

1 of 11 patches has a Reviewed-by or Acked-by.

PatchWolfram SangMichal SimekBenjamin Herrenschmidt
SeriesT-b
1/11R-b T-b A-b
2/11
3/11
4/11
5/11
6/11
7/11
8/11
9/11
10/11
11/11

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v1 thread

Cover letter [PATCH 00/11] Yet another series of OF merge patches.

Nothing much to say here other than mostly mechanical merging of OF support code. Some of it remains a little ugly, but I'm taking the approach of merging the code first, and refactoring it second.

I've pushed this series out to my test-devicetree branch on my git server if anyone wants to test. That branch also includes the previous 2 patch series that I've sent out.

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

Compile tested on: ppc64, ppc32, microblaze, sparc64, sparc32. Boot tested on mpc5200 (ppc32) platform.

---

Grant Likely (11):
of: unify phandle name in struct device_node
microblaze: gut implementation of early_init_dt_scan_cpus()
of: merge of_attach_node() & of_detach_node()
of: Merge of_node_get() and of_node_put()
of: merge machine_is_compatible()
of/flattree: merge early_init_devtree() and early_init_move_devtree() of/flattree: merge early_init_dt_scan_chosen() of/flattree: eliminate cell_t typedef
of/flattree: merge dt_mem_next_cell
of/flattree: Merge earlyinit_dt_scan_root()
of/flattree: Merge early_init_dt_check_for_initrd()

 arch/microblaze/include/asm/prom.h           |    4 
 arch/microblaze/kernel/prom.c                |  375 +-------------------------
 arch/powerpc/include/asm/prom.h              |    4 
 arch/powerpc/kernel/prom.c                   |  366 ++-----------------------
 arch/powerpc/platforms/powermac/pfunc_core.c |    2 
 arch/sparc/kernel/devices.c                  |    2 
 arch/sparc/kernel/of_device_32.c             |    2 
 arch/sparc/kernel/of_device_64.c             |    2 
 arch/sparc/kernel/prom_common.c              |    8 -
 arch/sparc/kernel/smp_64.c                   |    2 
 drivers/of/base.c                            |  153 +++++++++++
 drivers/of/fdt.c                             |  204 ++++++++++++++
 drivers/sbus/char/openprom.c                 |   10 -
 drivers/video/aty/atyfb_base.c               |    2 
 include/linux/of.h                           |    7 
 include/linux/of_fdt.h                       |   18 +
 16 files changed, 430 insertions(+), 731 deletions(-)
Signature · 1 line
Signature