From patchwork Mon May 7 03:50:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 157208 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 2AB95B6FA9 for ; Mon, 7 May 2012 13:52:01 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SRExp-0008CF-RL; Mon, 07 May 2012 03:50:21 +0000 Received: from mail-vb0-f49.google.com ([209.85.212.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SRExm-0008BA-Du for linux-arm-kernel@lists.infradead.org; Mon, 07 May 2012 03:50:19 +0000 Received: by vbbfo1 with SMTP id fo1so3883302vbb.36 for ; Sun, 06 May 2012 20:50:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding; bh=8FvhvU4h25GPBAyXrGfXl5TjTxt7yQi5jZO+jrGP3Hs=; b=beQ0RLZBAN7jz2n6IEXxz1mScgF4KDB8zPlbotrj/Dis4Hk8sOSLLJ4A9WeZIaoLb6 NxqzZHE1+E3D3DU23hq6EZqWtaBnzLlpX2k900Qz1jPJmP+0H1529Aqakmebwqsesey0 GKtuOXnQmLMmrGR8HaJETXIY+o56jnwY47ETWBJzpBygigQLeVIUYxTeLOgobIthHYg2 45ElBkFqWwrwMYX6SxlVb+wHs6Nba5Ffw+qUx2WVheStoi7dGNX5p8Bs7mm1xP7bAmZj 5nZSyDRv9SLLhEe6SwrI1LcXn/I4sPUOaZ9Hlm/hPgrN3Q2lbdnGvvFWr0MGUWsSELqJ 5n8g== MIME-Version: 1.0 Received: by 10.221.13.201 with SMTP id pn9mr3367049vcb.70.1336362617352; Sun, 06 May 2012 20:50:17 -0700 (PDT) Received: by 10.52.109.169 with HTTP; Sun, 6 May 2012 20:50:17 -0700 (PDT) In-Reply-To: References: Date: Mon, 7 May 2012 11:50:17 +0800 Message-ID: Subject: Re: [GIT PULL] [for 3.5] request pull of dt on arch-mmp From: Haojian Zhuang To: Bergmann Arnd , Olof Johansson , linux-arm-kernel@lists.infradead.org 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.212.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 On Sat, May 5, 2012 at 4:44 PM, Haojian Zhuang wrote: > Hi Arnd & Olof, > > Please help to pull dt branch on arch-mmp git tree. > > The following changes since commit 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a: > >  Linux 3.4-rc5 (2012-04-29 15:19:10 -0700) > Hi Arnd & Olof, Pleae help to pull dt branch on arch-pxa git tree. Since some power patches are depend on irq driver code and it's changed in dt branch. I merged these power patches in dt branch to avoid building issue. The following changes since commit 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a: Linux 3.4-rc5 (2012-04-29 15:19:10 -0700) are available in the git repository at: git://github.com/hzhuang1/linux.git dt Chao Xie (6): ARM: mmp: move XX_REG definition to addr-map.h ARM: mmp: add PM support for mmp2 ARM: mm: proc-mohawk: add suspend resume for mohawk ARM: cache: tauros2: add disable and resume callback ARM: mmp: add pm support for pxa910 Haojian Zhuang (9): ARM: mmp: fix build issue on mmp with device tree ARM: mmp: append CONFIG_MACH_MMP2_DT ARM: mmp: support DT in irq ARM: mmp: support DT in timer gpio: pxa: parse gpio from DTS file ARM: mmp: support mmp2 with device tree ARM: mmp: support pxa910 with device tree ARM: dts: refresh dts file for arch mmp Documentation: update docs for mmp dt .../devicetree/bindings/arm/mrvl/intc.txt | 40 ++ .../devicetree/bindings/arm/{ => mrvl}/mrvl.txt | 8 + .../devicetree/bindings/arm/mrvl/timer.txt | 13 + .../devicetree/bindings/gpio/mrvl-gpio.txt | 18 +- Documentation/devicetree/bindings/i2c/mrvl-i2c.txt | 15 +- arch/arm/Kconfig | 3 +- arch/arm/boot/dts/mmp2-brownstone.dts | 38 ++ arch/arm/boot/dts/mmp2.dtsi | 220 ++++++++++ arch/arm/boot/dts/pxa168.dtsi | 67 +++- arch/arm/boot/dts/pxa910-dkb.dts | 38 ++ arch/arm/boot/dts/pxa910.dtsi | 140 ++++++ arch/arm/mach-mmp/Kconfig | 29 +- arch/arm/mach-mmp/Makefile | 14 +- arch/arm/mach-mmp/include/mach/addr-map.h | 12 + arch/arm/mach-mmp/include/mach/entry-macro.S | 4 +- arch/arm/mach-mmp/include/mach/irqs.h | 27 +- arch/arm/mach-mmp/include/mach/pm-mmp2.h | 61 +++ arch/arm/mach-mmp/include/mach/pm-pxa910.h | 77 ++++ arch/arm/mach-mmp/include/mach/regs-apbc.h | 3 - arch/arm/mach-mmp/include/mach/regs-apmu.h | 3 - arch/arm/mach-mmp/irq-mmp2.c | 158 ------- arch/arm/mach-mmp/irq-pxa168.c | 54 --- arch/arm/mach-mmp/irq.c | 458 ++++++++++++++++++++ arch/arm/mach-mmp/mmp-dt.c | 66 ++-- arch/arm/mach-mmp/mmp2-dt.c | 60 +++ arch/arm/mach-mmp/pm-mmp2.c | 264 +++++++++++ arch/arm/mach-mmp/pm-pxa910.c | 285 ++++++++++++ arch/arm/mach-mmp/time.c | 81 +++- arch/arm/mach-mmp/ttc_dkb.c | 11 + arch/arm/mm/cache-tauros2.c | 24 + arch/arm/mm/proc-mohawk.S | 35 ++ drivers/gpio/gpio-pxa.c | 116 +++++- 32 files changed, 2101 insertions(+), 341 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/mrvl/intc.txt rename Documentation/devicetree/bindings/arm/{ => mrvl}/mrvl.txt (53%) create mode 100644 Documentation/devicetree/bindings/arm/mrvl/timer.txt create mode 100644 arch/arm/boot/dts/mmp2-brownstone.dts create mode 100644 arch/arm/boot/dts/mmp2.dtsi create mode 100644 arch/arm/boot/dts/pxa910-dkb.dts create mode 100644 arch/arm/boot/dts/pxa910.dtsi create mode 100644 arch/arm/mach-mmp/include/mach/pm-mmp2.h create mode 100644 arch/arm/mach-mmp/include/mach/pm-pxa910.h delete mode 100644 arch/arm/mach-mmp/irq-mmp2.c delete mode 100644 arch/arm/mach-mmp/irq-pxa168.c create mode 100644 arch/arm/mach-mmp/irq.c create mode 100644 arch/arm/mach-mmp/mmp2-dt.c create mode 100644 arch/arm/mach-mmp/pm-mmp2.c create mode 100644 arch/arm/mach-mmp/pm-pxa910.c Regards Haojian