From patchwork Fri Aug 30 20:30:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Cousson X-Patchwork-Id: 271440 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AD0E82C00B9 for ; Sat, 31 Aug 2013 06:31:39 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VFVLw-0006z0-GT; Fri, 30 Aug 2013 20:31:32 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VFVLu-0001a8-56; Fri, 30 Aug 2013 20:31:30 +0000 Received: from mail-wg0-f41.google.com ([74.125.82.41]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VFVLr-0001ZD-1n for linux-arm-kernel@lists.infradead.org; Fri, 30 Aug 2013 20:31:28 +0000 Received: by mail-wg0-f41.google.com with SMTP id b12so6988wgh.4 for ; Fri, 30 Aug 2013 13:31:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:organization:user-agent :mime-version:to:cc:subject:content-type:content-transfer-encoding; bh=W0UQVH2EYym6GOMo5S8PKaussh8b0x1YTehhTFwJxEs=; b=SKJWfY6iEckSOEjzoctoD3ax6X5RaZbkG2BFcQIlEVjqi+4W2CSBLnrtp94akZn1/7 Vh+skq5dUSTyoAjCKnLQiOO5Rl/KUo+hQ25oBp1aCU/vJEe5F+CB28eZOPpwlSuOeqwb kb4Ama1Pre6Ox8FcW4PmxNqEqMHIeG2cIfiFKGY6FSENbXybyj39uMI/KfZ6EI3RwQFS QaLx/EsWK2wBP7m5dR4ANVMlhVN4+EU5erz2npplqT9pr/Oir/st6F7nvZn8jvJR5cnq gh8I7SYKUwNgnL0KNFvAyMBtIBlFLEpO9gL9Kd/RVRQICXiZBZr71pHI5JPBD765m0Al 1ugg== X-Gm-Message-State: ALoCoQkjUdKDHo9tsie11WcAPr8V5Ao83knFoUE3UC6y/7kfKD1T5xEPMua4XQyPBKtLo0yKgTj6 X-Received: by 10.180.185.77 with SMTP id fa13mr3811776wic.58.1377894662903; Fri, 30 Aug 2013 13:31:02 -0700 (PDT) Received: from ?IPv6:2a01:e35:2e4f:6090:2d72:ddf8:1209:818c? ([2a01:e35:2e4f:6090:2d72:ddf8:1209:818c]) by mx.google.com with ESMTPSA id mw9sm101041wic.4.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 30 Aug 2013 13:31:02 -0700 (PDT) Message-ID: <522100FF.5030204@baylibre.com> Date: Fri, 30 Aug 2013 22:30:55 +0200 From: Benoit Cousson Organization: BayLibre User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130803 Thunderbird/17.0.8 MIME-Version: 1.0 To: "khilman@linaro.org" , Olof Johansson Subject: [GIT PULL] ARM: OMAP: Device Tree for 3.12 take #2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130830_163127_212869_4CB90C89 X-CRM114-Status: GOOD ( 14.51 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.41 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Tony Lindgren , "linux-omap@vger.kernel.org" , linux-arm-kernel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Hi Kevin & Olof, Here is the updated version without the conflicting patch (ARM: dts: AM33XX: don't redefine OCP bus and device nodes) and with the signed tag. There is still a small conflict with usb-next, but it is easily fixable, and already fixed by Stephen. Thanks, Benoit The following changes since commit b36f4be3de1b123d8601de062e7dbfc904f305fb: Linux 3.11-rc6 (2013-08-18 14:36:53 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git tags/for_3.12/dts_signed for you to fetch changes up to 4843be165c10f9886c87eeb20acf19a3ddec6653: ARM: configs: omap2plus_defconfig: enable dwc3 and dependencies (2013-08-30 21:33:13 +0200) ---------------------------------------------------------------- Add the minimal DTS support for DRA7xx based SoC core. Add the initial support for N900 and gta04 phones. Enable USB3 on OMAP5 evm board. Do a lot of various cleanups. ---------------------------------------------------------------- Afzal Mohammed (2): ARM: dts: AM4372: cpu(s) node per latest binding ARM: dts: AM4372: add few nodes Alexandre Belloni (1): ARM: dts: AM33XX: Add PMU support Benoit Cousson (1): ARM: OMAP5: hwmod: add missing ocp2scp hwmod data Felipe Balbi (4): ARM: OMAP5: dts: fix reg property size ARM: OMAP5: dts: fix ocp2scp DTS data ARM: OMAP5: dts: add palmas-usb node ARM: configs: omap2plus_defconfig: enable dwc3 and dependencies Javier Martinez Canillas (4): ARM: dts: omap3-igep: add pinmux node for GPIO LED configuration ARM: dts: omap3-igep0020: add mux conf for GPIO LEDs ARM: dts: omap3-igep0030: add mux conf for GPIO LED ARM: dts: AM33XX: use pinmux node defined in included file Kishon Vijay Abraham I (1): ARM: dts: omap5-uevm: Split SMPS10 in two nodes Lars Poeschel (1): ARM: dts: AM33xx: Correct gpio #interrupt-cells property Lee Jones (7): ARM: dts: Remove '0x's from OMAP2420 H4 DTS file ARM: dts: Remove '0x's from OMAP3 IGEP0020 DTS file ARM: dts: Remove '0x's from OMAP3 IGEP0030 DTS file ARM: dts: Remove '0x's from OMAP3 DTS file ARM: dts: Remove '0x's from OMAP3430 SDP DTS file ARM: dts: Remove '0x's from OMAP4 DTS file ARM: dts: Remove '0x's from OMAP5 DTS file Marek Belisko (1): ARM: dts: Add devicetree for gta04 board. Pavel Machek (1): ARM: dts: N900: Add device tree R Sricharan (1): ARM: dts: DRA7: Add the dts files for dra7 SoC and dra7-evm board Robert Nelson (1): ARM: dts: omap3-beagle-xm: fix string error in compatible property Roger Quadros (1): ARM: dts: omap3-beagle: Make USB host pin naming consistent Ruslan Bilovol (1): ARM: dts: twl6030: Move common configuration for OMAP4 boards in a separate dtsi file arch/arm/boot/dts/Makefile | 5 +- arch/arm/boot/dts/am335x-bone.dts | 176 ++++----- arch/arm/boot/dts/am335x-evm.dts | 254 ++++++------- arch/arm/boot/dts/am335x-evmsk.dts | 258 ++++++------- arch/arm/boot/dts/am33xx.dtsi | 13 +- arch/arm/boot/dts/am4372.dtsi | 347 +++++++++++++++++ arch/arm/boot/dts/dra7-evm.dts | 140 +++++++ arch/arm/boot/dts/dra7.dtsi | 575 +++++++++++++++++++++++++++++ arch/arm/boot/dts/omap2420-h4.dts | 6 +- arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +- arch/arm/boot/dts/omap3-beagle.dts | 24 +- arch/arm/boot/dts/omap3-gta04.dts | 168 +++++++++ arch/arm/boot/dts/omap3-igep.dtsi | 2 + arch/arm/boot/dts/omap3-igep0020.dts | 19 +- arch/arm/boot/dts/omap3-igep0030.dts | 17 +- arch/arm/boot/dts/omap3-n900.dts | 92 +++++ arch/arm/boot/dts/omap3.dtsi | 2 +- arch/arm/boot/dts/omap3430-sdp.dts | 22 +- arch/arm/boot/dts/omap4-panda-common.dtsi | 21 +- arch/arm/boot/dts/omap4-sdp.dts | 21 +- arch/arm/boot/dts/omap4.dtsi | 2 +- arch/arm/boot/dts/omap5-uevm.dts | 25 +- arch/arm/boot/dts/omap5.dtsi | 13 +- arch/arm/boot/dts/twl6030_omap4.dtsi | 38 ++ arch/arm/configs/omap2plus_defconfig | 9 + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 45 +++ include/dt-bindings/pinctrl/dra.h | 50 +++ 27 files changed, 1912 insertions(+), 434 deletions(-) create mode 100644 arch/arm/boot/dts/dra7-evm.dts create mode 100644 arch/arm/boot/dts/dra7.dtsi create mode 100644 arch/arm/boot/dts/omap3-gta04.dts create mode 100644 arch/arm/boot/dts/omap3-n900.dts create mode 100644 arch/arm/boot/dts/twl6030_omap4.dtsi create mode 100644 include/dt-bindings/pinctrl/dra.h