| Message ID | CAN1soZzUi6U0ybxYX=WTGdCaBysL98qjWX7AjnEAGW_bFpVfnQ@mail.gmail.com |
|---|---|
| State | New |
| Headers | show |
On Monday 14 May 2012, Haojian Zhuang wrote: > Please help to merge power branch in arch-pxa tree. These power > patches are depend > on dt patches since irq driver is changed in dt patches. > > 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 power Pulled, thanks a lot! Arnd
Hi Olof & Arnd, Please help to merge power branch in arch-pxa tree. These power patches are depend on dt patches since irq driver is changed in dt patches. 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 power 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