From patchwork Mon May 23 15:50:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 96975 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DB36FB6FB5 for ; Tue, 24 May 2011 01:50:47 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by bombadil.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QOXP1-0001cJ-NM; Mon, 23 May 2011 15:50:43 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QOXP0-0006xu-I6; Mon, 23 May 2011 15:50:42 +0000 Received: from mail-yx0-f177.google.com ([209.85.213.177]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QOXOw-0006xS-Rm for linux-arm-kernel@lists.infradead.org; Mon, 23 May 2011 15:50:39 +0000 Received: by yxh35 with SMTP id 35so2490038yxh.36 for ; Mon, 23 May 2011 08:50:36 -0700 (PDT) Received: by 10.42.219.134 with SMTP id hu6mr9043579icb.119.1306165836135; Mon, 23 May 2011 08:50:36 -0700 (PDT) MIME-Version: 1.0 Received: by 10.231.16.77 with HTTP; Mon, 23 May 2011 08:50:15 -0700 (PDT) From: Grant Likely Date: Mon, 23 May 2011 09:50:15 -0600 X-Google-Sender-Auth: b3xtyXdfOQANns50NVxbWK6R8yw Message-ID: Subject: [git pull] ARM Device tree support To: Russell King , Arnd Bergmann , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, Linux Kernel Mailing List , nicolas.pitre@linaro.org X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110523_115039_085052_1230F5EB X-CRM114-Status: GOOD ( 14.99 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.213.177 listed in list.dnswl.org] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Hi Russell, How do you want to handle merging the ARM DT support? Do you want to pull it into your tree, or would you like me to ask Linus to pull directly? As you can see, It does include a couple of pre-requisite cross-arch cleanups that I normally push to Linus directly. The following changes since commit 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf: Linux 2.6.39 (2011-05-18 21:06:34 -0700) are available in the git repository at: git://git.secretlab.ca/git/linux-2.6 devicetree/arm-next Andres Salomon (1): of/flattree: minor cleanups Grant Likely (6): dt/flattree: explicitly pass command line pointer to early_init_dt_scan_chosen arm/dt: Make __vet_atags also accept a dtb image arm/dt: Allow CONFIG_OF on ARM arm/dt: consolidate atags setup into setup_machine_atags arm/dt: probe for platforms via the device tree dt: add documentation of ARM dt boot interface Documentation/arm/Booting | 33 +++++- Documentation/devicetree/booting-without-of.txt | 48 +++++++- arch/arm/Kconfig | 7 + arch/arm/include/asm/mach/arch.h | 9 ++ arch/arm/include/asm/prom.h | 37 ++++++ arch/arm/include/asm/setup.h | 4 + arch/arm/kernel/Makefile | 1 + arch/arm/kernel/devtree.c | 145 +++++++++++++++++++++++ arch/arm/kernel/head-common.S | 24 +++- arch/arm/kernel/head.S | 8 +- arch/arm/kernel/setup.c | 90 +++++++++----- arch/arm/mm/init.c | 11 ++ arch/microblaze/kernel/prom.c | 2 +- arch/mips/include/asm/prom.h | 3 - arch/mips/kernel/prom.c | 3 +- arch/powerpc/kernel/prom.c | 2 +- drivers/of/fdt.c | 8 +- 17 files changed, 375 insertions(+), 60 deletions(-) create mode 100644 arch/arm/include/asm/prom.h create mode 100644 arch/arm/kernel/devtree.c