From patchwork Fri Feb 1 15:51:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Cooper X-Patchwork-Id: 217510 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 B89D92C0297 for ; Sat, 2 Feb 2013 02:55:34 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U1Ium-0004Op-DH; Fri, 01 Feb 2013 15:52:32 +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 1U1IuI-0004Ef-9Z for linux-arm-kernel@lists.infradead.org; Fri, 01 Feb 2013 15:52:07 +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 1U1IuI-000EwH-0Q; Fri, 01 Feb 2013 15:52:02 +0000 Received: from localhost.localdomain (triton.lakedaemon.net [10.16.5.78]) by titan (Postfix) with ESMTP id 92BFA3E7CF8; Fri, 1 Feb 2013 10:52:00 -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: U2FsdGVkX18S66gAJFNOT6Atft48+L+PHPTbD8tEYVc= Content-Disposition: inline MIME-Version: 1.0 X-Mailer: MIME::Lite 3.029 (F2.78; T1.35; A2.11; B3.08; Q3.08) Date: Fri, 1 Feb 2013 15:51:59 +0000 From: Jason Cooper To: Arnd Bergmann , Olof Johansson Message-Id: <1359733919.FeBB7DA4.22262@triton> In-Reply-To: <1359733918.Bf7ecc0.22262@triton> Subject: [GIT PULL 4/4] ARM: mvebu: dt for v3.9 In-Reply-To: X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130201_105202_555680_F22A6617 X-CRM114-Status: GOOD ( 13.48 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 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] 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 949db153b6466c6f7cad5a427ecea94985927311: Linux 3.8-rc5 are available in the git repository at: git://git.infradead.org/users/jcooper/linux.git tags/dt_for_v3.9 for you to fetch changes up to 1bead82fa5a52cd21c30c0c28615157d5c3dac9f: arm: mvebu: add button for OpenBlocks AX3-4 ---------------------------------------------------------------- mvebu dt changes for v3.9 - mvebu - add rtc support - add sdio support - add button support for AX3-4 - kirkwood - add sdio support - add twsi1 and nand to 88f6282 - convert openblocks A6 to pinctrl - convert more of nsa310 to dt - gpio-poweroff for ns2 - dove - move led pinctrl to gpio-leds node - use fixed regulator for usb power depends on: - tags/boards_for_v3.9, which pulls in: - tags/mvebu_fixes_for_v3.8-rc6 - tags/cleanup_for_v3.9_round2 - tags/drivers_for_v3.9 - mmc/mmc-next up to: d293875 mmc: mvsdio: add pinctrl integration ---------------------------------------------------------------- Andrew Lunn (4): ARM: Kirkwood: Convert NSA310 to DT based regulators. ARM: Kirkwood: Convert NSA310 to use gpio-poweroff driver ARM: Kirkwood: Convert NSA310 I2C to device tree ARM: Kirkwood: Convert NS2 to gpio-poweroff. Gregory CLEMENT (1): arm: mvebu: Add RTC support for Armada 370 and Armada XP Jason Cooper (1): Merge tag 'tags/boards_for_v3.9' into mvebu/dt 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 (2): ARM: Dove: move CuBox led pinctrl to gpio-leds node ARM: Dove: add fixed regulator for CuBox USB power Thomas Petazzoni (11): 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 arm: mvebu: add button for OpenBlocks AX3-4 .../bindings/mmc/brcm,bcm2835-sdhci.txt | 18 ++ .../devicetree/bindings/mmc/orion-sdio.txt | 17 ++ arch/arm/boot/dts/Makefile | 2 + arch/arm/boot/dts/armada-370-db.dts | 15 + arch/arm/boot/dts/armada-370-mirabox.dts | 10 + arch/arm/boot/dts/armada-370-rd.dts | 61 ++++ 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 | 6 + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 6 + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 6 + .../arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 12 + arch/arm/boot/dts/armada-xp.dtsi | 2 +- arch/arm/boot/dts/dove-cubox.dts | 28 +- arch/arm/boot/dts/dove.dtsi | 2 + arch/arm/boot/dts/kirkwood-6282.dtsi | 17 ++ arch/arm/boot/dts/kirkwood-dreamplug.dts | 7 + .../boot/dts/kirkwood-guruplug-server-plus.dts | 94 +++++++ arch/arm/boot/dts/kirkwood-mplcec4.dts | 11 +- arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 6 + arch/arm/boot/dts/kirkwood-nsa310.dts | 27 ++ arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 116 ++++++++ arch/arm/boot/dts/kirkwood.dtsi | 8 + arch/arm/configs/dove_defconfig | 28 +- arch/arm/configs/kirkwood_defconfig | 1 + arch/arm/configs/mvebu_defconfig | 16 ++ arch/arm/mach-dove/Kconfig | 7 + arch/arm/mach-dove/Makefile | 4 +- arch/arm/mach-dove/board-dt.c | 102 +++++++ arch/arm/mach-dove/common.c | 114 +------- arch/arm/mach-kirkwood/Kconfig | 7 + arch/arm/mach-kirkwood/Makefile | 2 +- arch/arm/mach-kirkwood/board-dreamplug.c | 6 - arch/arm/mach-kirkwood/board-dt.c | 15 +- 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 | 14 - arch/arm/mach-kirkwood/board-nsa310.c | 51 +--- arch/arm/mach-kirkwood/board-openblocks_a6.c | 44 --- arch/arm/mach-kirkwood/common.c | 23 ++ arch/arm/mach-kirkwood/common.h | 6 + arch/arm/mach-kirkwood/dockstar-setup.c | 1 - arch/arm/mach-kirkwood/include/mach/kirkwood.h | 3 +- arch/arm/mach-kirkwood/pcie.c | 10 +- arch/arm/mach-mvebu/irq-armada-370-xp.c | 72 +++++ arch/arm/plat-orion/mpp.c | 2 +- drivers/cpuidle/Kconfig | 6 + drivers/cpuidle/Makefile | 1 + .../cpuidle/cpuidle-kirkwood.c | 45 ++- drivers/mmc/card/block.c | 30 +- drivers/mmc/card/queue.c | 32 ++- drivers/mmc/card/queue.h | 3 + drivers/mmc/core/bus.c | 1 + drivers/mmc/core/core.c | 121 +++++++- drivers/mmc/core/core.h | 1 + drivers/mmc/core/sdio.c | 33 ++- drivers/mmc/core/slot-gpio.c | 57 +++- drivers/mmc/host/Kconfig | 11 + drivers/mmc/host/Makefile | 1 + drivers/mmc/host/mvsdio.c | 131 +++++---- drivers/mmc/host/sdhci-bcm2835.c | 227 +++++++++++++++ drivers/mmc/host/sdhci-esdhc-imx.c | 59 +--- drivers/mmc/host/sdhci-pxav3.c | 12 +- drivers/mmc/host/sdhci.c | 117 +++++--- drivers/mmc/host/sh_mmcif.c | 280 +++++++++++-------- drivers/mmc/host/tmio_mmc_pio.c | 8 - drivers/rtc/Kconfig | 2 +- include/linux/mmc/card.h | 12 + include/linux/mmc/core.h | 3 +- include/linux/mmc/host.h | 25 ++ 72 files changed, 1688 insertions(+), 610 deletions(-) create mode 100644 Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt create mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt create mode 100644 arch/arm/boot/dts/armada-370-rd.dts create mode 100644 arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts create mode 100644 arch/arm/mach-dove/board-dt.c create mode 100644 arch/arm/mach-kirkwood/board-guruplug.c rename arch/arm/mach-kirkwood/cpuidle.c => drivers/cpuidle/cpuidle-kirkwood.c (61%) create mode 100644 drivers/mmc/host/sdhci-bcm2835.c