From patchwork Mon Sep 10 05:48:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Cooper X-Patchwork-Id: 183996 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [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 B0BA32C009A for ; Sat, 15 Sep 2012 04:14:49 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TCaLa-0000VI-La; Fri, 14 Sep 2012 18:10:34 +0000 Received: from mho-04-ewr.mailhop.org ([204.13.248.74] helo=mho-02-ewr.mailhop.org) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TAwrP-0000wz-3K for linux-arm-kernel@lists.infradead.org; Mon, 10 Sep 2012 05:48:39 +0000 Received: from pool-173-50-127-139.nrflva.fios.verizon.net ([173.50.127.139] helo=titan) by mho-02-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1TAwrN-000GmE-7E; Mon, 10 Sep 2012 05:48:37 +0000 Received: from titan.lakedaemon.net (localhost [127.0.0.1]) by titan (Postfix) with ESMTP id 66AE6378984; Mon, 10 Sep 2012 01:48:35 -0400 (EDT) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 173.50.127.139 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX189zt1LGqaNTuz6/pT1Chh9ZLT6GZYteGE= Date: Mon, 10 Sep 2012 01:48:35 -0400 From: Jason Cooper To: Arnd Bergmann , Olof Johansson Subject: [GIT PULL V2 1/4] ARM: Kirkwood: DT bindings for v3.7 Message-ID: <20120910054835.GC15277@titan.lakedaemon.net> References: <20120829001129.GO19437@titan.lakedaemon.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20120829001129.GO19437@titan.lakedaemon.net> User-Agent: Mutt/1.5.20 (2009-06-14) X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. X-Spam-Note: CRM114 invocation failed 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.74 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Mailman-Approved-At: Fri, 14 Sep 2012 14:09:30 -0400 Cc: Gregory CLEMENT , Andrew Lunn , Thomas Petazzoni , 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 Arnd, Olof, This branch depends on arm/cache-l2x0 which is going in through rmk's tree. arm/cache-l2x0 contains the following from Gregory Clement: arm: cache-l2x0: make outer_cache_fns a field of l2x0_of_data arm: cache-l2x0: add an optional register to save/restore When I created kirkwood/dt, I merged arm/cache-l2x0. So, you shouldn't get a conflict when you pull both of these, right? Or, should I do the request-pull based on arm/cache-l2x0? That doesn't sound right. Just let me know if I need to fix it. thx, Jason. The following changes since commit 55d512e245bc7699a8800e23df1a24195dd08217: Linux 3.6-rc5 (2012-09-08 16:43:45 -0700) are available in the git repository at: git://git.infradead.org/users/jcooper/linux.git kirkwood/dt Andrew Lunn (3): ARM: Kirkwood: ehci-orion: Add device tree binding ARM: Kirkwood: Convert all DT boards to EHCI via DT. Crypto: CESA: Add support for DT based instantiation. Arnaud Patard (2): ARM: Kirkwood: Describe iconnect keys in DT. ARM: Kirkwood: Describe iconnect nand in DT. Gregory CLEMENT (6): arm: cache-l2x0: make outer_cache_fns a field of l2x0_of_data arm: cache-l2x0: add an optional register to save/restore arm: cache-l2x0: add support for Aurora L2 cache ctrl arm: mvebu: add L2 cache support arm: mvebu: add Aurora L2 Cache Controller to the DT arm: l2x0: add aurora related properties to OF binding Documentation/devicetree/bindings/arm/l2cc.txt | 9 + .../devicetree/bindings/crypto/mv_cesa.txt | 20 ++ .../devicetree/bindings/usb/ehci-orion.txt | 19 ++ arch/arm/boot/dts/armada-370.dtsi | 6 + arch/arm/boot/dts/armada-xp.dtsi | 7 + arch/arm/boot/dts/kirkwood-iconnect.dts | 50 ++++- arch/arm/boot/dts/kirkwood.dtsi | 20 ++- arch/arm/include/asm/hardware/cache-aurora-l2.h | 55 ++++ arch/arm/include/asm/hardware/cache-l2x0.h | 5 + arch/arm/mach-kirkwood/board-dnskw.c | 1 - arch/arm/mach-kirkwood/board-dreamplug.c | 1 - arch/arm/mach-kirkwood/board-dt.c | 3 +- arch/arm/mach-kirkwood/board-goflexnet.c | 1 - arch/arm/mach-kirkwood/board-ib62x0.c | 1 - arch/arm/mach-kirkwood/board-iconnect.c | 49 ---- arch/arm/mach-kirkwood/board-lsxl.c | 1 - arch/arm/mach-kirkwood/board-ts219.c | 1 - arch/arm/mach-mvebu/Kconfig | 1 + arch/arm/mach-mvebu/irq-armada-370-xp.c | 4 + arch/arm/mm/cache-l2x0.c | 275 ++++++++++++++++++-- drivers/crypto/mv_cesa.c | 17 +- drivers/usb/host/ehci-orion.c | 61 ++++- 22 files changed, 522 insertions(+), 85 deletions(-) create mode 100644 Documentation/devicetree/bindings/crypto/mv_cesa.txt create mode 100644 Documentation/devicetree/bindings/usb/ehci-orion.txt create mode 100644 arch/arm/include/asm/hardware/cache-aurora-l2.h