From patchwork Sat Jan 12 23:29:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Cooper X-Patchwork-Id: 211571 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 563E42C0109 for ; Sun, 13 Jan 2013 10:33:37 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TuAWQ-0004GA-Jh; Sat, 12 Jan 2013 23:29:54 +0000 Received: from mho-03-ewr.mailhop.org ([204.13.248.66] helo=mho-01-ewr.mailhop.org) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TuAW1-0004DD-1f for linux-arm-kernel@lists.infradead.org; Sat, 12 Jan 2013 23:29:32 +0000 Received: from pool-72-84-113-162.nrflva.fios.verizon.net ([72.84.113.162] helo=titan) by mho-01-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1TuAVz-0003wC-Uy; Sat, 12 Jan 2013 23:29:28 +0000 Received: from localhost.localdomain (triton.lakedaemon.net [10.16.5.78]) by titan (Postfix) with ESMTP id 1C58B3CDB42; Sat, 12 Jan 2013 18:29:25 -0500 (EST) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 72.84.113.162 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+ipEXM5csbHecFK2HwqdRjT96lvqu1NOg= Content-Disposition: inline MIME-Version: 1.0 X-Mailer: MIME::Lite 3.029 (F2.78; T1.35; A2.11; B3.08; Q3.08) Date: Sat, 12 Jan 2013 23:29:07 +0000 From: Jason Cooper To: Arnd Bergmann , Olof Johansson Subject: [GIT PULL 0/4] ARM: mvebu: changes for v3.9 Message-Id: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130112_182929_419719_6035438F X-CRM114-Status: GOOD ( 13.39 ) X-Spam-Score: -1.3 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.66 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.6 INVALID_MSGID Message-Id is not valid, according to RFC 2822 Cc: Linux ARM Kernel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 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 The following changes since commit 417f2732930e5c5544ef3a3a0141d44b2639e8e8: Merge branch 'next/drivers' into for-next (2013-01-08 15:09:33 -0800) are available in the git repository at: git://git.infradead.org/users/jcooper/linux.git mvebu/for-next for you to fetch changes up to 9e896ba256a01808f2804944f258b0ac578d9c2e: Merge branch 'mvebu/dt' into mvebu/for-next (2013-01-12 22:39:17 +0000) ---------------------------------------------------------------- Andrew Lunn (1): ARM: Kirkwood: Cleanup unneeded include files Gregory CLEMENT (6): arm: mvebu: Improve the SMP support of the interrupt controller ARM: mvebu: Fix interrupt handling in SMP mode rtc: Add support of rtc-mv for MVEBU SoCs arm: mvebu: Update defconfig with Marvell RTC support arm: mvebu: Add RTC support for Armada 370 and Armada XP arm: mvebu: Fix memory size for Armada 370 DB Jason Cooper (9): Merge branch 'mvebu/drivers' into mvebu/boards Merge branch 'mvebu/drivers' into mvebu/boards Merge branch 'mvebu/boards' into mvebu/dt Merge branch 'mvebu/fixes' into mvebu/dt Merge branch 'mvebu/fixes' into mvebu/for-next Merge branch 'mvebu/cleanup' into mvebu/for-next Merge branch 'mvebu/drivers' into mvebu/for-next Merge branch 'mvebu/boards' into mvebu/for-next Merge branch 'mvebu/dt' into mvebu/for-next Jason Gunthorpe (1): ARM: Kirkwood: Support basic hotplug for PCI-E Nobuhiro Iwamatsu (3): ARM: Kirkwood: Add pinctrl of TWSI1 to 88f6282 ARM: Kirkwood: Add pinctrl of NAND to 88f6282 ARM: Kirkwood: Convert openblocks A6 board to pinctrl Sebastian Hesselbarth (3): ARM: Dove: add Cubox sdhci card detect gpio ARM: Dove: move CuBox led pinctrl to gpio-leds node ARM: Dove: add fixed regulator for CuBox USB power Simon Guinot (1): ARM: Kirkwood: fix ns2 gpios by converting to pinctrl Thomas Petazzoni (19): arm: mvebu: use global interrupts for GPIOs on Armada XP arm: kirkwood: dockstar: remove useless include of SDIO header mmc: mvsdio: use slot-gpio infrastructure for write protect gpio mmc: mvsdio: use slot-gpio for card detect gpio mmc: mvsdio: implement a Device Tree binding mmc: mvsdio: add pinctrl integration arm: mvebu: enable SDIO support in mvebu_defconfig arm: mvebu: enable mwifiex driver in mvebu_defconfig arm: mvebu: enable btmrvl driver in mvebu_defconfig arm: mvebu: add DT information for the SDIO interface of Armada 370/XP arm: mvebu: add pin muxing options for the SDIO interface on Armada 370 arm: mvebu: add pin muxing options for the SDIO interface on Armada XP arm: mvebu: enable the SD card slot on Armada XP DB board arm: mvebu: enable the SD card slot on Armada 370 DB board arm: mvebu: enable the SDIO interface on the Globalscale Mirabox arm: kirkwood: add Device Tree informations for the SDIO controller arm: kirkwood: dreamplug: use Device Tree to probe SDIO arm: kirkwood: mplcec4: use Device Tree to probe SDIO arm: kirkwood: add pinmux option for the SDIO interface on 88F6282 Willy Tarreau (1): ARM: kirkwood: convert Guruplug Server Plus to use the device tree .../devicetree/bindings/mmc/orion-sdio.txt | 17 +++ arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/armada-370-db.dts | 17 ++- arch/arm/boot/dts/armada-370-mirabox.dts | 10 ++ arch/arm/boot/dts/armada-370-xp.dtsi | 14 +++ arch/arm/boot/dts/armada-370.dtsi | 12 ++ arch/arm/boot/dts/armada-xp-db.dts | 7 ++ arch/arm/boot/dts/armada-xp-mv78230.dtsi | 20 +-- arch/arm/boot/dts/armada-xp-mv78260.dtsi | 27 ++-- arch/arm/boot/dts/armada-xp-mv78460.dtsi | 27 ++-- arch/arm/boot/dts/armada-xp.dtsi | 2 +- arch/arm/boot/dts/dove-cubox.dts | 40 +++++- arch/arm/boot/dts/kirkwood-6282.dtsi | 17 +++ arch/arm/boot/dts/kirkwood-dreamplug.dts | 7 ++ .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 94 ++++++++++++++ arch/arm/boot/dts/kirkwood-mplcec4.dts | 11 +- arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 16 +++ arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 116 ++++++++++++++++++ arch/arm/boot/dts/kirkwood.dtsi | 8 ++ arch/arm/configs/mvebu_defconfig | 9 ++ arch/arm/mach-dove/Kconfig | 2 + arch/arm/mach-kirkwood/Kconfig | 7 ++ arch/arm/mach-kirkwood/Makefile | 1 + arch/arm/mach-kirkwood/board-dreamplug.c | 6 - arch/arm/mach-kirkwood/board-dt.c | 4 + arch/arm/mach-kirkwood/board-guruplug.c | 39 ++++++ arch/arm/mach-kirkwood/board-ib62x0.c | 1 - arch/arm/mach-kirkwood/board-mplcec4.c | 8 -- arch/arm/mach-kirkwood/board-ns2.c | 38 ------ arch/arm/mach-kirkwood/board-openblocks_a6.c | 44 ------- arch/arm/mach-kirkwood/common.h | 5 + arch/arm/mach-kirkwood/dockstar-setup.c | 1 - arch/arm/mach-kirkwood/pcie.c | 10 +- arch/arm/mach-mvebu/irq-armada-370-xp.c | 72 +++++++++++ drivers/mmc/host/mvsdio.c | 136 +++++++++------------ drivers/rtc/Kconfig | 2 +- 36 files changed, 629 insertions(+), 219 deletions(-) create mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt create mode 100644 arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts create mode 100644 arch/arm/mach-kirkwood/board-guruplug.c