From patchwork Sat Feb 16 20:04:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Cooper X-Patchwork-Id: 221050 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 6BE202C007C for ; Sun, 17 Feb 2013 11:53:23 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U6sSW-0002JA-Dc; Sun, 17 Feb 2013 00:50:24 +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 1U6sS1-0002FM-GV for linux-arm-kernel@lists.infradead.org; Sun, 17 Feb 2013 00:49:56 +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 1U6sS1-0009Hj-5I; Sun, 17 Feb 2013 00:49:53 +0000 Received: from titan.lakedaemon.net (localhost [127.0.0.1]) by titan (Postfix) with ESMTP id 919713F186F; Sat, 16 Feb 2013 15:04:10 -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: U2FsdGVkX19bjxJZSDXw7n9b9x5D3AQPi0OutvUmksE= Date: Sat, 16 Feb 2013 15:04:10 -0500 From: Jason Cooper To: Arnd Bergmann , Olof Johansson Subject: [GIT PULL 3/4] ARM: mvebu: dt changes for v3.9 Message-ID: <20130216200410.GJ23237@titan.lakedaemon.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130216_194953_668270_34B3FE94 X-CRM114-Status: GOOD ( 13.15 ) X-Spam-Score: -0.3 (/) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-0.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.6 DATE_IN_PAST_03_06 Date: is 3 to 6 hours before Received: date -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Andrew Lunn , 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 1bead82fa5a52cd21c30c0c28615157d5c3dac9f: arm: mvebu: add button for OpenBlocks AX3-4 (2013-01-31 20:44:08 +0000) are available in the git repository at: git://git.infradead.org/users/jcooper/linux.git tags/dt_for_v3.9_round2 for you to fetch changes up to d892d02956c3cbe6835480a20ba553fbb0699666: arm: mvebu: enable the SD card slot on Armada 370 Reference Design board (2013-02-16 16:27:13 +0000) ---------------------------------------------------------------- mvebu dt changes for v3.9 round2 - mvebu - USB support - local timers - SPI controller and flash - SD slot on the Reference Design board - kirkwood - topkick pinctrl, i2c and mvsdio - nsa310 pinctrl - dove - USB support - use clocks instead of clock-frequency for serial I included patches depending on the mvsdio changes Chris Ball took, since tags/boards_for_v3.9 has been pulled with that dependency. All other patches with external dependencies are going into a separate branch, mvebu/dt_deps. If necessary, they can wait for v3.10. new depends: - mvebu/boards new conflicts: - arch/arm/mach-kirkwood/board-nsa310.c - remove the gpio.h include line. ** below is from previous tag dt_for_v3.9 ** 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 (1): ARM: Kirkwood: topkick: Enable i2c bus. Ezequiel Garcia (7): arm: mvebu: Update defconfig to select USB support arm: mvebu: Add support for USB host controllers in Armada 370/XP arm: mvebu: Enable USB controllers on Armada 370/XP boards ARM: mvebu: Update defconfig to select SPI support ARM: mvebu: Update defconfig to select SPI flash and MTD support arm: mvebu: Add support for SPI controller in Armada 370/XP arm: mvebu: Add SPI flash on Armada XP-GP board Florian Fainelli (1): arm: mvebu: enable the SD card slot on Armada 370 Reference Design board Gregory CLEMENT (8): arm: mvebu: Add support for local interrupt clocksource: time-armada-370-xp: add local timer support arm: mvebu: update defconfig with local timer support arm: mvebu: update DT to support local timers clocksource: update and move armada-370-xp-timer documentation to timer directory arm: mvebu: support for the new Armada XP development board(DB-MV784MP-GP) arm: mvebu: Add SPI flash on Armada XP-DB board arm: mvebu: Add SPI flash on Armada 370 DB board Jason Cooper (5): Merge branch 'mvebu/boards' into mvebu/dt Merge branch 'mvebu/boards' into mvebu/dt ARM: kirkwood: topkick: convert to pinctrl ARM: kirkwood: nsa310: convert to pinctrl ARM: kirkwood: topkick: init mvsdio via DT Sebastian Hesselbarth (2): ARM: Dove: convert usb host controller to DT ARM: dove: convert serial DT nodes to clocks property .../marvell,armada-370-xp-timer.txt} | 11 +- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/armada-370-db.dts | 20 +++ arch/arm/boot/dts/armada-370-mirabox.dts | 8 ++ arch/arm/boot/dts/armada-370-rd.dts | 7 + arch/arm/boot/dts/armada-370-xp.dtsi | 41 +++++- arch/arm/boot/dts/armada-370.dtsi | 9 ++ arch/arm/boot/dts/armada-xp-db.dts | 24 ++++ arch/arm/boot/dts/armada-xp-gp.dts | 113 ++++++++++++++++ arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 6 + arch/arm/boot/dts/armada-xp.dtsi | 17 +++ arch/arm/boot/dts/dove.dtsi | 24 +++- arch/arm/boot/dts/kirkwood-nsa310.dts | 99 ++++++++++++++ arch/arm/boot/dts/kirkwood-topkick.dts | 102 ++++++++++++++ arch/arm/configs/mvebu_defconfig | 11 +- arch/arm/mach-dove/board-dt.c | 10 -- arch/arm/mach-kirkwood/board-dt.c | 3 - arch/arm/mach-kirkwood/board-nsa310.c | 26 ---- arch/arm/mach-kirkwood/board-usi_topkick.c | 48 ------- arch/arm/mach-kirkwood/common.h | 6 - arch/arm/mach-mvebu/irq-armada-370-xp.c | 15 ++- drivers/clocksource/time-armada-370-xp.c | 150 +++++++++++++++------ 22 files changed, 604 insertions(+), 147 deletions(-) rename Documentation/devicetree/bindings/{arm/armada-370-xp-timer.txt => timer/marvell,armada-370-xp-timer.txt} (55%) create mode 100644 arch/arm/boot/dts/armada-xp-gp.dts