| Submitter | Haojian Zhuang |
|---|---|
| Date | Aug. 5, 2012, 4:45 p.m. |
| Message ID | <CAN1soZwtVE2ud1t27Cw-_s0DxhMJTG9usu_u5xnEY8rnYfKy3g@mail.gmail.com> |
| Download | mbox |
| Permalink | /patch/175191/ |
| State | New |
| Headers | show
Return-Path: <linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org> 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 76C742C00A5 for <incoming-imx@patchwork.ozlabs.org>; Mon, 6 Aug 2012 02:56:34 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sy43u-0005Bb-O1; Sun, 05 Aug 2012 16:52:18 +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 1Sy43r-0005BN-U5 for linux-arm-kernel@lists.infradead.org; Sun, 05 Aug 2012 16:52:16 +0000 Received: by bkcji2 with SMTP id ji2so893471bkc.36 for <linux-arm-kernel@lists.infradead.org>; Sun, 05 Aug 2012 09:52:12 -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=JGVzZz6NlqpU/Cn5B4UrU7STpBA+UxtsBQHSJLIhibY=; b=vvRK4bpmnYC3n3RV99+FzWRDw32FCCI+8ixZpO+TwDJzeOsQa7mfZ1p/YdSLE65lzq Klb3FwSi+/EJOhHlYnFVHWZqZVcLy+JDj7QVvLwV6/gG6uYGnHp8xQgl20Y/TmYeYeeP jKkZpdJ7VfQJsbBrXHvLCLx8apDQEXNOz0O5InUe1gAwfGwPZfU+Elr3Y9caeYJmyEFF 0E7FI7ksIox5ON5wS5BhSsvFb57qVbrJa6qiXHLbXQGkBA1pUwZ4zKiixT0KgYLeErRK S4Z9AZ3zsKJ9zGv/N1wa+KCMm7/FE1J4sSffscIbvr0i1+C9jb01xc/RaLOKZnQPLbgY 13vw== MIME-Version: 1.0 Received: by 10.204.152.145 with SMTP id g17mr3005305bkw.120.1344185109467; Sun, 05 Aug 2012 09:45:09 -0700 (PDT) Received: by 10.204.103.82 with HTTP; Sun, 5 Aug 2012 09:45:09 -0700 (PDT) Date: Mon, 6 Aug 2012 00:45:09 +0800 Message-ID: <CAN1soZwtVE2ud1t27Cw-_s0DxhMJTG9usu_u5xnEY8rnYfKy3g@mail.gmail.com> Subject: [GIT PULL][for 3.7 v3] pull request from dt_mmp branch in pxa git tree From: Haojian Zhuang <haojian.zhuang@gmail.com> To: Olof Johansson <olof@lixom.net>, Bergmann Arnd <arnd@arndb.de>, linux-arm-kernel@lists.infradead.org, Daniel Mack <zonque@gmail.com>, xie chao <xiechao.mail@gmail.com> 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.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (haojian.zhuang[at]gmail.com) -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 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: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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_mmp branch in pxa git tree. It's the V3 version. The changes are in below. 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_mmp for you to fetch changes up to cd62ea8749e6383c0f76b57300be22503014b1c8: ARM: mmp: enable tauros2 cache in mmp2 dt (2012-08-06 00:39:24 +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 (8): pinctrl: append new pins and groups in pxa910 pinctrl: add pinconf support in pxa3xx pinctrl: support dt in pxa series pinctrl: append new groups of mmp2 ARM: mmp: select pinctrl for boards with DT ARM: dts: add pinctrl in PXA DT files 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 ++ .../bindings/pinctrl/mrvl,pxa3xx-pinctrl.txt | 35 +++ Documentation/devicetree/bindings/rtc/pxa-rtc.txt | 14 + arch/arm/boot/dts/mmp2-brownstone.dts | 51 +++ arch/arm/boot/dts/mmp2.dtsi | 10 + arch/arm/boot/dts/pxa168.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-dkb.dts | 47 +++ arch/arm/boot/dts/pxa910.dtsi | 10 + arch/arm/include/asm/hardware/cache-tauros2.h | 5 +- arch/arm/mach-dove/common.c | 2 +- arch/arm/mach-mmp/Kconfig | 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/pinctrl/pinctrl-mmp2.c | 18 +- drivers/pinctrl/pinctrl-pxa168.c | 10 +- drivers/pinctrl/pinctrl-pxa3xx.c | 325 ++++++++++++++++++++ drivers/pinctrl/pinctrl-pxa3xx.h | 17 + drivers/pinctrl/pinctrl-pxa910.c | 16 +- drivers/rtc/rtc-pxa.c | 11 + 32 files changed, 1169 insertions(+), 124 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/pinctrl/mrvl,pxa3xx-pinctrl.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