From patchwork Thu Aug 16 08:44:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 177920 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 84A572C008D for ; Thu, 16 Aug 2012 18:47:46 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T1vgi-0007p6-8m; Thu, 16 Aug 2012 08:44:20 +0000 Received: from mail-bk0-f49.google.com ([209.85.214.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T1vgf-0007oN-Hf for linux-arm-kernel@lists.infradead.org; Thu, 16 Aug 2012 08:44:18 +0000 Received: by bkcji2 with SMTP id ji2so918961bkc.36 for ; Thu, 16 Aug 2012 01:44:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=qcCxImvY66mH4l0RMInA5wD+jmwabpgm363LkU/OTSU=; b=eB3Lv2GUXm0UnpvbxEdPIetxQG5UOlG6+BtgQKLs0klZIrsBLLdtXNEKFOdk+0vN6n kQQJryO/HMpfRkhTnXgBVoyCI/VdZrrq0AkO4O99pwKFR+4cogbi/2o+CtuwNtjZIN1r toAiWsiEmLEBrS5pdnR0jybvwkNRlGzhstt/03PyQcth/jitt+A7FxHR23D2DQ1Ay4Vp mYfZGbBzDc54DAuo2utxBRGR7dxSgwHJRov+inX3FAVjrdWNK3M9J+wYwo84OmTop9ON IxOlTwbqYRWoxgtkHz5kyISrDjPVlOTHgKUOv2n8aLLnXUWmDpW2gY0xGjn1x92sWaXh Lerg== MIME-Version: 1.0 Received: by 10.204.129.16 with SMTP id m16mr114488bks.136.1345106655851; Thu, 16 Aug 2012 01:44:15 -0700 (PDT) Received: by 10.204.167.72 with HTTP; Thu, 16 Aug 2012 01:44:15 -0700 (PDT) Date: Thu, 16 Aug 2012 16:44:15 +0800 Message-ID: Subject: [GIT PULL][for 3.7] pull request from dt branch in pxa git tree From: Haojian Zhuang To: linux-arm-kernel@lists.infradead.org, Bergmann Arnd , Olof Johansson X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (haojian.zhuang[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 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 Hi Olof & Arnd, Please help to merge these patches from dt branch in pxa git tree. It's the V4 version. The changes are in below. v4: 1. remove pinctrl patches for pxa. v3: 1. Revert d03c1990c9681047bf94caa497c41172b3f28351 GPIO: gpio-pxa: fix devicetree functions since it's merged into Linus' gpio tree. v2: 1. Add Linus's Ack in pinctrl driver. 2. Add chao's & haojian's patches for Tauros2 cache. The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee: Linux 3.6-rc1 (2012-08-02 16:38:10 -0700) are available in the git repository at: git://github.com/hzhuang1/linux.git dt for you to fetch changes up to 51931b37fcb17a2f48f726fd21b88e3af770ddc2: ARM: mmp: enable tauros2 cache in mmp2 dt (2012-08-16 16:17:10 +0800) ---------------------------------------------------------------- Chao Xie (7): ARM: pxa: support CKENC in clk_enable gpio: pxa: add chain_eneter and chain_exit for irq handler ARM: cache: fix uninitialized ptr in tauros2_init ARM: cache: add cputype.h for tauros2 ARM: cache: add extra feature enable for tauros2 ARM: mmp&dove: modify tauros2_init call ARM: cache: add dt support for tauros2 cache Daniel Mack (7): RTC: add DT bindings to pxa-rtc MTD: pxa3xx-nand: add devicetree bindings GPIO: gpio-pxa: simplify pxa_gpio_to_irq() and pxa_irq_to_chip() ARM: pxa: add devicetree code for irq handling ARM: pxa3xx: skip default device initialization when booting via DT ARM: pxa3xx: add generic DT machine code ARM: pxa: add .dtsi files Haojian Zhuang (2): ARM: mmp: enable tauros2 cache in pxa910 ARM: mmp: enable tauros2 cache in mmp2 dt .../devicetree/bindings/arm/mrvl/tauros2.txt | 17 +++ .../devicetree/bindings/mtd/pxa3xx-nand.txt | 31 +++++ Documentation/devicetree/bindings/rtc/pxa-rtc.txt | 14 +++ arch/arm/boot/dts/mmp2.dtsi | 5 + arch/arm/boot/dts/pxa27x.dtsi | 14 +++ arch/arm/boot/dts/pxa2xx.dtsi | 132 ++++++++++++++++++++ arch/arm/boot/dts/pxa3xx.dtsi | 32 +++++ arch/arm/boot/dts/pxa910.dtsi | 5 + arch/arm/include/asm/hardware/cache-tauros2.h | 5 +- arch/arm/mach-dove/common.c | 2 +- arch/arm/mach-mmp/mmp2.c | 2 +- arch/arm/mach-mmp/pxa910.c | 4 + arch/arm/mach-pxa/Kconfig | 12 ++ arch/arm/mach-pxa/Makefile | 3 + arch/arm/mach-pxa/clock-pxa3xx.c | 8 +- arch/arm/mach-pxa/irq.c | 131 +++++++++++++++---- arch/arm/mach-pxa/pxa-dt.c | 63 ++++++++++ arch/arm/mach-pxa/pxa3xx.c | 21 +++- arch/arm/mm/cache-tauros2.c | 83 ++++++++---- drivers/gpio/gpio-pxa.c | 77 ++++-------- drivers/mtd/nand/pxa3xx_nand.c | 85 ++++++++++--- drivers/rtc/rtc-pxa.c | 11 ++ 22 files changed, 639 insertions(+), 118 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/mrvl/tauros2.txt create mode 100644 Documentation/devicetree/bindings/mtd/pxa3xx-nand.txt create mode 100644 Documentation/devicetree/bindings/rtc/pxa-rtc.txt create mode 100644 arch/arm/boot/dts/pxa27x.dtsi create mode 100644 arch/arm/boot/dts/pxa2xx.dtsi create mode 100644 arch/arm/boot/dts/pxa3xx.dtsi create mode 100644 arch/arm/mach-pxa/pxa-dt.c