On Thu, Jun 9, 2011 at 5:41 AM, Nicolas Pitre nicolas.pitre@linaro.org wrote:

On Wed, 8 Jun 2011, John Rigby wrote:

...

Nicolas,

Is device tree stuff equivalent to what was in .38 going in?  I'm looking for the equivalent of what went into .38 in commit 3fb7bd037f31f5acdc213c0eb431c07a38803445

Merge branch 'devicetree/arm-linaro-2.6.38' of git://git.secretlab.ca/git/linux-2.6 into linaro-2.6.38

Hmmm... In fact it looks like the machine specific bits are missing.

@Grant: what is the plan for those?  Do you have a branch with them on top of what went into 3.0-rc1?

Is this stuff in yet? Actually I just checked the tree and I don't see much new in this area but just wanted to make sure I am not mistaken.

John

On Mon, Jun 20, 2011 at 10:17 AM, Nicolas Pitre nicolas.pitre@linaro.org wrote:

On Mon, 20 Jun 2011, John Rigby wrote:

...

On Thu, Jun 9, 2011 at 5:41 AM, Nicolas Pitre nicolas.pitre@linaro.org wrote:

...

On Wed, 8 Jun 2011, John Rigby wrote:

...

Nicolas,

Is device tree stuff equivalent to what was in .38 going in?  I'm looking for the equivalent of what went into .38 in commit 3fb7bd037f31f5acdc213c0eb431c07a38803445

Merge branch 'devicetree/arm-linaro-2.6.38' of git://git.secretlab.ca/git/linux-2.6 into linaro-2.6.38

Hmmm... In fact it looks like the machine specific bits are missing.

@Grant: what is the plan for those?  Do you have a branch with them on top of what went into 3.0-rc1?

Is this stuff in yet?  Actually I just checked the tree and I don't see much new in this area but just wanted to make sure I am not mistaken.

Grant promised a branch for me to pull.  It should come soon.

Here it is. I've included the full DT support for versatile and some of the newer infrastructure. I've not build tested very many platforms though, there may be some build errors lurking, but it will boot versatile on qemu.

g.

The following changes since commit aa02eee19229add6da7cfcbb4c0e7da2b49439aa:

ARM: head, zImage: Always Enter the kernel in ARM state (2011-06-20 10:50:54 -0400)

are available in the git repository at: git://git.secretlab.ca/git/linux-2.6 devicetree/linaro-2.6.39

Andy Doan (1): arm/dt: Add basic device tree support for overo

Grant Likely (18): arm/dt: Add dt machine definition dt: add documentation of ARM dt boot interface irq: add irq_domain translation infrastructure of/address: Add of_find_matching_node_by_address helper dt/irq: add irq_domain_generate_simple() helper dt: add of_platform_populate() for creating device from the device tree dt: Add default match table for bus ids drivers/amba: create devices from device tree dt/platform: allow device name to be overridden arm/dt: Add skeleton dtsi file arm/versatile: Add device tree support arm/dt: Basic tegra devicetree support arm/dt: Add Pandaboard devicetree support arm/dt: Add basic device tree support for mx51 and mx53 boards arm/dt: Add basic device tree support for Beagleboard arm/dt: Add basic devicetree support to IGEPv2 and v3 arm/dt: vexpress: add basic DT platform matching support dt: include linux/errno.h in linux/of_address.h

Rob Herring (1): arm/dt: Add dtb make rule

Shawn Guo (1): arm/dt: Add a make rule to build dtb for enabled boards

Thomas Abraham (1): arm/dt: Add basic device tree support for smdkv310 board

Documentation/arm/Booting | 33 +++- .../devicetree/bindings/arm/freescale.txt | 7 + Documentation/devicetree/bindings/arm/genesi.txt | 8 + .../devicetree/bindings/arm/primecell.txt | 21 ++ Documentation/devicetree/bindings/arm/samsung.txt | 9 + Documentation/devicetree/booting-without-of.txt | 48 +++++- arch/arm/Makefile | 7 + arch/arm/boot/Makefile | 6 + arch/arm/boot/dts/exynos4-smdkv310.dts | 11 + arch/arm/boot/dts/genesi-efikamx.dts | 22 +++ arch/arm/boot/dts/genesi-efikasb.dts | 22 +++ arch/arm/boot/dts/isee-igep-v2.dts | 7 + arch/arm/boot/dts/isee-igep-v3.dts | 7 + arch/arm/boot/dts/mx51-babbage.dts | 22 +++ arch/arm/boot/dts/mx53-loco.dts | 22 +++ arch/arm/boot/dts/omap3-beagle.dts | 7 + arch/arm/boot/dts/omap3-overo.dts | 7 + arch/arm/boot/dts/omap4-panda.dts | 11 + arch/arm/boot/dts/skeleton.dtsi | 13 ++ arch/arm/boot/dts/tegra-harmony.dts | 7 + arch/arm/boot/dts/versatile-ab.dts | 185 ++++++++++++++++++ arch/arm/boot/dts/versatile-pb.dts | 48 +++++ arch/arm/boot/dts/vexpress.dts | 10 + arch/arm/include/asm/mach/arch.h | 9 + arch/arm/include/asm/prom.h | 5 - arch/arm/kernel/devtree.c | 14 -- arch/arm/mach-exynos4/Makefile.boot | 2 + arch/arm/mach-exynos4/mach-smdkv310.c | 6 + arch/arm/mach-mx5/Makefile.boot | 5 + arch/arm/mach-mx5/board-mx51_babbage.c | 6 + arch/arm/mach-mx5/board-mx51_efikamx.c | 6 + arch/arm/mach-mx5/board-mx51_efikasb.c | 6 + arch/arm/mach-mx5/board-mx53_loco.c | 5 + arch/arm/mach-omap2/Makefile.boot | 6 + arch/arm/mach-omap2/board-igep0020.c | 12 ++ arch/arm/mach-omap2/board-omap3beagle.c | 6 + arch/arm/mach-omap2/board-omap4panda.c | 6 + arch/arm/mach-omap2/board-overo.c | 6 + arch/arm/mach-tegra/Makefile.boot | 2 + arch/arm/mach-tegra/board-harmony.c | 6 + arch/arm/mach-versatile/Kconfig | 8 + arch/arm/mach-versatile/Makefile | 1 + arch/arm/mach-versatile/Makefile.boot | 2 + arch/arm/mach-versatile/core.c | 61 ++++++ arch/arm/mach-versatile/core.h | 2 + arch/arm/mach-versatile/versatile_dt.c | 51 +++++ arch/arm/mach-vexpress/Makefile.boot | 2 + arch/arm/mach-vexpress/v2m.c | 6 + arch/microblaze/include/asm/irq.h | 10 +- arch/microblaze/kernel/irq.c | 7 - arch/mips/include/asm/irq.h | 5 - arch/mips/kernel/prom.c | 14 -- arch/powerpc/include/asm/irq.h | 1 + arch/x86/include/asm/irq_controller.h | 12 -- arch/x86/include/asm/prom.h | 10 - arch/x86/kernel/devicetree.c | 96 +++------- drivers/of/address.c | 18 ++ drivers/of/platform.c | 196 +++++++++++++++++++- include/linux/irq.h | 92 +++++++++ include/linux/of_address.h | 5 + include/linux/of_irq.h | 2 + include/linux/of_platform.h | 40 ++++ kernel/irq/Makefile | 2 +- kernel/irq/irqdomain.c | 193 +++++++++++++++++++ 64 files changed, 1325 insertions(+), 159 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/freescale.txt create mode 100644 Documentation/devicetree/bindings/arm/genesi.txt create mode 100644 Documentation/devicetree/bindings/arm/primecell.txt create mode 100644 Documentation/devicetree/bindings/arm/samsung.txt create mode 100644 arch/arm/boot/dts/exynos4-smdkv310.dts create mode 100644 arch/arm/boot/dts/genesi-efikamx.dts create mode 100644 arch/arm/boot/dts/genesi-efikasb.dts create mode 100644 arch/arm/boot/dts/isee-igep-v2.dts create mode 100644 arch/arm/boot/dts/isee-igep-v3.dts create mode 100644 arch/arm/boot/dts/mx51-babbage.dts create mode 100644 arch/arm/boot/dts/mx53-loco.dts create mode 100644 arch/arm/boot/dts/omap3-beagle.dts create mode 100644 arch/arm/boot/dts/omap3-overo.dts create mode 100644 arch/arm/boot/dts/omap4-panda.dts create mode 100644 arch/arm/boot/dts/skeleton.dtsi create mode 100644 arch/arm/boot/dts/tegra-harmony.dts create mode 100644 arch/arm/boot/dts/versatile-ab.dts create mode 100644 arch/arm/boot/dts/versatile-pb.dts create mode 100644 arch/arm/boot/dts/vexpress.dts create mode 100644 arch/arm/mach-versatile/versatile_dt.c delete mode 100644 arch/x86/include/asm/irq_controller.h create mode 100644 kernel/irq/irqdomain.c