From patchwork Sun Aug 5 16:45:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [GIT, PULL, for, 3.7, v3] pull request from dt_mmp branch in pxa git tree From: Haojian Zhuang X-Patchwork-Id: 175191 Message-Id: To: Olof Johansson , Bergmann Arnd , linux-arm-kernel@lists.infradead.org, Daniel Mack , xie chao Date: Mon, 6 Aug 2012 00:45:09 +0800 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