From patchwork Tue Oct 25 09:10:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 121515 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AEE93B6F7E for ; Tue, 25 Oct 2011 20:11:17 +1100 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RId1t-00041U-4v; Tue, 25 Oct 2011 09:10:41 +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 1RId1s-0004HV-Sx; Tue, 25 Oct 2011 09:10:40 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RId1m-0004Fn-1n for linux-arm-kernel@lists.infradead.org; Tue, 25 Oct 2011 09:10:35 +0000 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1RId1k-0003tj-K8; Tue, 25 Oct 2011 11:10:32 +0200 Received: from sha by dude.hi.pengutronix.de with local (Exim 4.77) (envelope-from ) id 1RId1k-0000ij-4n; Tue, 25 Oct 2011 11:10:32 +0200 Date: Tue, 25 Oct 2011 11:10:32 +0200 From: Sascha Hauer To: Arnd Bergmann Subject: [GIT PULL] i.MX5 devicetree support Message-ID: <20111025091032.GT23421@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 11:07:56 up 5 days, 15:43, 23 users, load average: 0.02, 0.09, 0.18 User-Agent: Mutt/1.5.21 (2010-09-15) X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20111025_051034_395987_DF809366 X-CRM114-Status: GOOD ( 29.46 ) X-Spam-Score: -0.5 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.5 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Cc: Shawn Guo , linux-arm-kernel@lists.infradead.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 Arnd, Please pull the following. It contains devicetree support for i.MX5 based systems. You can use the following to resolve the merge conflicts against your for-next branch: git://git.pengutronix.de/git/imx/linux-2.6.git imx-dt-merge Sascha The following changes since commit 976d167615b64e14bc1491ca51d424e2ba9a5e84: Linux 3.1-rc9 (2011-10-04 18:11:50 -0700) are available in the git repository at: git://git.pengutronix.de/git/imx/linux-2.6.git imx-features-for-arnd Shawn Guo (2): arm/mx5: add device tree support for imx53 boards arm/mx5: add device tree support for imx51 babbage Documentation/devicetree/bindings/arm/fsl.txt | 19 ++ arch/arm/boot/dts/imx51-babbage.dts | 135 +++++++++++ arch/arm/boot/dts/imx51.dtsi | 246 ++++++++++++++++++++ arch/arm/boot/dts/imx53-ard.dts | 113 +++++++++ arch/arm/boot/dts/imx53-evk.dts | 120 ++++++++++ arch/arm/boot/dts/imx53-qsb.dts | 125 ++++++++++ arch/arm/boot/dts/imx53-smd.dts | 169 ++++++++++++++ arch/arm/boot/dts/imx53.dtsi | 301 +++++++++++++++++++++++++ arch/arm/mach-mx5/Kconfig | 21 ++ arch/arm/mach-mx5/Makefile | 3 + arch/arm/mach-mx5/board-mx51_babbage.c | 9 +- arch/arm/mach-mx5/board-mx53_ard.c | 12 +- arch/arm/mach-mx5/board-mx53_evk.c | 9 +- arch/arm/mach-mx5/board-mx53_loco.c | 9 +- arch/arm/mach-mx5/board-mx53_smd.c | 9 +- arch/arm/mach-mx5/clock-mx51-mx53.c | 39 ++++ arch/arm/mach-mx5/imx51-dt.c | 116 ++++++++++ arch/arm/mach-mx5/imx53-dt.c | 126 +++++++++++ arch/arm/plat-mxc/include/mach/common.h | 8 + 19 files changed, 1577 insertions(+), 12 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/fsl.txt create mode 100644 arch/arm/boot/dts/imx51-babbage.dts create mode 100644 arch/arm/boot/dts/imx51.dtsi create mode 100644 arch/arm/boot/dts/imx53-ard.dts create mode 100644 arch/arm/boot/dts/imx53-evk.dts create mode 100644 arch/arm/boot/dts/imx53-qsb.dts create mode 100644 arch/arm/boot/dts/imx53-smd.dts create mode 100644 arch/arm/boot/dts/imx53.dtsi create mode 100644 arch/arm/mach-mx5/imx51-dt.c create mode 100644 arch/arm/mach-mx5/imx53-dt.c