Patchwork [GIT,PULL,for,3.7] pull request from dt-mmp branch in pxa git tree

login
register
mail settings
Submitter Haojian Zhuang
Date Aug. 3, 2012, 6:53 a.m.
Message ID <CAN1soZy-FBmywNLn9a0yanx9ojfB-jnqzYyXwAYr6F1_Khvacg@mail.gmail.com>
Download mbox
Permalink /patch/174897/
State New
Headers show

Pull-request

git://github.com/hzhuang1/linux.git dt-mmp

Comments

Haojian Zhuang - Aug. 3, 2012, 6:53 a.m.
Hi Olof & Arnd,

Please help to merge these patches from dt-mmp branch in pxa git tree.

Regards
Haojian

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 c807e2a01b45aa921bb6e3bf68bf135fddaa538c:

  ARM: dts: add pinctrl in PXA DT files (2012-08-03 14:43:05 +0800)

----------------------------------------------------------------
Daniel Mack (9):
      RTC: add DT bindings to pxa-rtc
      MMC: pxa-mci: add DT bindings
      MTD: pxa3xx-nand: add devicetree bindings
      GPIO: gpio-pxa: simplify pxa_gpio_to_irq() and pxa_irq_to_chip()
      GPIO: gpio-pxa: fix devicetree functions
      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 (6):
      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

 Documentation/devicetree/bindings/mmc/pxa-mmc.txt  |   25 ++
 .../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                        |    5 +
 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                      |    5 +
 arch/arm/mach-mmp/Kconfig                          |    2 +
 arch/arm/mach-pxa/Kconfig                          |   12 +
 arch/arm/mach-pxa/Makefile                         |    3 +
 arch/arm/mach-pxa/irq.c                            |  131 ++++++--
 arch/arm/mach-pxa/pxa-dt.c                         |   63 ++++
 arch/arm/mach-pxa/pxa3xx.c                         |   21 +-
 drivers/gpio/gpio-pxa.c                            |   96 +++---
 drivers/mmc/host/pxamci.c                          |   52 ++++
 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 +
 27 files changed, 1160 insertions(+), 98 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mmc/pxa-mmc.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
Olof Johansson - Aug. 4, 2012, 6:27 p.m.
Hi,

Looking at your branch more in detail now, and there's a few things I
would like to see changed. See below:


> Daniel Mack (9):
>       RTC: add DT bindings to pxa-rtc
>       MMC: pxa-mci: add DT bindings
>       MTD: pxa3xx-nand: add devicetree bindings
>       GPIO: gpio-pxa: simplify pxa_gpio_to_irq() and pxa_irq_to_chip()
>       GPIO: gpio-pxa: fix devicetree functions
>       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 (6):
>       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

None of these have acks from Linus Walleij. They should possibly even
be merged through his tree. If you need them in both trees, or if you
have dependencies on other changes done in this branch, then there's
two options:

* Create one branch that gets pulled into both pinctrl and arm-soc
trees, and we need to agree that neither of us will rebase it
* Collect acks from Linus W and ask him if it's OK that you merge
through arm-soc.

I also don't see any devicetree bindings documented for the PXA
pinctrl bindings?

There are also a bunch of other changes to the tauros2 code that is in
this branch but was not in the pull request. Some of code should
probably go in through Russell's tree since it touches core ARM code.


-Olof
Linus Walleij - Aug. 5, 2012, 12:02 a.m.
On Sat, Aug 4, 2012 at 8:27 PM, Olof Johansson <olof@lixom.net> wrote:

> None of these have acks from Linus Walleij. They should possibly even
> be merged through his tree.

I haven't managed to look closer at them until now. It's a bit confusing
since there are several iterations of the patches and two authors
involved, point me to missed patches if I don't see them.

I will assume that you want to send this through the ARM SoC tree
and ACK the stuff that looks good to me.

Yours,
Linus Walleij
Haojian Zhuang - Aug. 5, 2012, 2:57 a.m.
On Sun, Aug 5, 2012 at 8:02 AM, Linus Walleij <linus.walleij@linaro.org> wrote:
> On Sat, Aug 4, 2012 at 8:27 PM, Olof Johansson <olof@lixom.net> wrote:
>
>> None of these have acks from Linus Walleij. They should possibly even
>> be merged through his tree.
>
> I haven't managed to look closer at them until now. It's a bit confusing
> since there are several iterations of the patches and two authors
> involved, point me to missed patches if I don't see them.
>
> I will assume that you want to send this through the ARM SoC tree
> and ACK the stuff that looks good to me.
>
> Yours,
> Linus Walleij

Thanks. I'll append your Ack and send the pull quest again.

Regards
Haojian