* [GIT PULL] [for 3.5] request pull of dt on arch-mmp @ 2012-05-05 8:44 Haojian Zhuang 2012-05-07 3:50 ` Haojian Zhuang 0 siblings, 1 reply; 4+ messages in thread From: Haojian Zhuang @ 2012-05-05 8:44 UTC (permalink / raw) To: linux-arm-kernel 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) are available in the git repository at: git://github.com/hzhuang1/linux.git dt 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 | 1 + 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 | 9 +- arch/arm/mach-mmp/include/mach/entry-macro.S | 4 +- arch/arm/mach-mmp/include/mach/irqs.h | 27 +- arch/arm/mach-mmp/irq-mmp2.c | 158 ------- arch/arm/mach-mmp/irq-pxa168.c | 54 --- arch/arm/mach-mmp/irq.c | 445 ++++++++++++++++++++ arch/arm/mach-mmp/mmp-dt.c | 66 ++-- arch/arm/mach-mmp/mmp2-dt.c | 60 +++ arch/arm/mach-mmp/time.c | 81 +++- drivers/gpio/gpio-pxa.c | 116 +++++- 22 files changed, 1313 insertions(+), 334 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 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL] [for 3.5] request pull of dt on arch-mmp 2012-05-05 8:44 [GIT PULL] [for 3.5] request pull of dt on arch-mmp Haojian Zhuang @ 2012-05-07 3:50 ` Haojian Zhuang 2012-05-09 8:56 ` Olof Johansson 0 siblings, 1 reply; 4+ messages in thread From: Haojian Zhuang @ 2012-05-07 3:50 UTC (permalink / raw) To: linux-arm-kernel On Sat, May 5, 2012 at 4:44 PM, Haojian Zhuang <haojian.zhuang@gmail.com> 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL] [for 3.5] request pull of dt on arch-mmp 2012-05-07 3:50 ` Haojian Zhuang @ 2012-05-09 8:56 ` Olof Johansson 2012-05-14 1:46 ` Haojian Zhuang 0 siblings, 1 reply; 4+ messages in thread From: Olof Johansson @ 2012-05-09 8:56 UTC (permalink / raw) To: linux-arm-kernel Hi, On Sun, May 6, 2012 at 8:50 PM, Haojian Zhuang <haojian.zhuang@gmail.com> wrote: > On Sat, May 5, 2012 at 4:44 PM, Haojian Zhuang <haojian.zhuang@gmail.com> 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 way to do this is to still send two branches, one that includes the dt code, and one that contains the power management changes but that is based on the dt branch, and then explicitly mention in the pull request that there is dependencies between the two. Can you please do that, i.e. reset the dt branch back to only contain the dt changes, and then take what is essentially this later pull and do that as a 'pm' branch instead? Thanks, -Olof ^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL] [for 3.5] request pull of dt on arch-mmp 2012-05-09 8:56 ` Olof Johansson @ 2012-05-14 1:46 ` Haojian Zhuang 0 siblings, 0 replies; 4+ messages in thread From: Haojian Zhuang @ 2012-05-14 1:46 UTC (permalink / raw) To: linux-arm-kernel On Wed, May 9, 2012 at 4:56 PM, Olof Johansson <olof@lixom.net> wrote: > Hi, > > On Sun, May 6, 2012 at 8:50 PM, Haojian Zhuang <haojian.zhuang@gmail.com> wrote: >> On Sat, May 5, 2012 at 4:44 PM, Haojian Zhuang <haojian.zhuang@gmail.com> 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 way to do this is to still send two branches, one that includes > the dt code, and one that contains the power management changes but > that is based on the dt branch, and then explicitly mention in the > pull request that there is dependencies between the two. > > Can you please do that, i.e. reset the dt branch back to only contain > the dt changes, and then take what is essentially this later pull and > do that as a 'pm' branch instead? > > > Thanks, > > -Olof Sure. These two requests will be sent out immediately. Regards Haojian ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-05-14 1:46 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-05-05 8:44 [GIT PULL] [for 3.5] request pull of dt on arch-mmp Haojian Zhuang 2012-05-07 3:50 ` Haojian Zhuang 2012-05-09 8:56 ` Olof Johansson 2012-05-14 1:46 ` Haojian Zhuang
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.