[GIT PULL 0/4] ARM: mvebu: changes for v3.9

[GIT PULL 0/4] ARM: mvebu: changes for v3.9

[Jason Cooper]

The following changes since commit 417f2732930e5c5544ef3a3a0141d44b2639e8e8:

  Merge branch 'next/drivers' into for-next (2013-01-08 15:09:33 -0800)

are available in the git repository at:


  git://git.infradead.org/users/jcooper/linux.git mvebu/for-next

for you to fetch changes up to 9e896ba256a01808f2804944f258b0ac578d9c2e:

  Merge branch 'mvebu/dt' into mvebu/for-next (2013-01-12 22:39:17 +0000)

----------------------------------------------------------------

Andrew Lunn (1):
      ARM: Kirkwood: Cleanup unneeded include files

Gregory CLEMENT (6):
      arm: mvebu: Improve the SMP support of the interrupt controller
      ARM: mvebu: Fix interrupt handling in SMP mode
      rtc: Add support of rtc-mv for MVEBU SoCs
      arm: mvebu: Update defconfig with Marvell RTC support
      arm: mvebu: Add RTC support for Armada 370 and Armada XP
      arm: mvebu: Fix memory size for Armada 370 DB

Jason Cooper (9):
      Merge branch 'mvebu/drivers' into mvebu/boards
      Merge branch 'mvebu/drivers' into mvebu/boards
      Merge branch 'mvebu/boards' into mvebu/dt
      Merge branch 'mvebu/fixes' into mvebu/dt
      Merge branch 'mvebu/fixes' into mvebu/for-next
      Merge branch 'mvebu/cleanup' into mvebu/for-next
      Merge branch 'mvebu/drivers' into mvebu/for-next
      Merge branch 'mvebu/boards' into mvebu/for-next
      Merge branch 'mvebu/dt' into mvebu/for-next

Jason Gunthorpe (1):
      ARM: Kirkwood: Support basic hotplug for PCI-E

Nobuhiro Iwamatsu (3):
      ARM: Kirkwood: Add pinctrl of TWSI1 to 88f6282
      ARM: Kirkwood: Add pinctrl of NAND to 88f6282
      ARM: Kirkwood: Convert openblocks A6 board to pinctrl

Sebastian Hesselbarth (3):
      ARM: Dove: add Cubox sdhci card detect gpio
      ARM: Dove: move CuBox led pinctrl to gpio-leds node
      ARM: Dove: add fixed regulator for CuBox USB power

Simon Guinot (1):
      ARM: Kirkwood: fix ns2 gpios by converting to pinctrl

Thomas Petazzoni (19):
      arm: mvebu: use global interrupts for GPIOs on Armada XP
      arm: kirkwood: dockstar: remove useless include of SDIO header
      mmc: mvsdio: use slot-gpio infrastructure for write protect gpio
      mmc: mvsdio: use slot-gpio for card detect gpio
      mmc: mvsdio: implement a Device Tree binding
      mmc: mvsdio: add pinctrl integration
      arm: mvebu: enable SDIO support in mvebu_defconfig
      arm: mvebu: enable mwifiex driver in mvebu_defconfig
      arm: mvebu: enable btmrvl driver in mvebu_defconfig
      arm: mvebu: add DT information for the SDIO interface of Armada 370/XP
      arm: mvebu: add pin muxing options for the SDIO interface on Armada 370
      arm: mvebu: add pin muxing options for the SDIO interface on Armada XP
      arm: mvebu: enable the SD card slot on Armada XP DB board
      arm: mvebu: enable the SD card slot on Armada 370 DB board
      arm: mvebu: enable the SDIO interface on the Globalscale Mirabox
      arm: kirkwood: add Device Tree informations for the SDIO controller
      arm: kirkwood: dreamplug: use Device Tree to probe SDIO
      arm: kirkwood: mplcec4: use Device Tree to probe SDIO
      arm: kirkwood: add pinmux option for the SDIO interface on 88F6282

Willy Tarreau (1):
      ARM: kirkwood: convert Guruplug Server Plus to use the device tree

 .../devicetree/bindings/mmc/orion-sdio.txt         |  17 +++
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/armada-370-db.dts                |  17 ++-
 arch/arm/boot/dts/armada-370-mirabox.dts           |  10 ++
 arch/arm/boot/dts/armada-370-xp.dtsi               |  14 +++
 arch/arm/boot/dts/armada-370.dtsi                  |  12 ++
 arch/arm/boot/dts/armada-xp-db.dts                 |   7 ++
 arch/arm/boot/dts/armada-xp-mv78230.dtsi           |  20 +--
 arch/arm/boot/dts/armada-xp-mv78260.dtsi           |  27 ++--
 arch/arm/boot/dts/armada-xp-mv78460.dtsi           |  27 ++--
 arch/arm/boot/dts/armada-xp.dtsi                   |   2 +-
 arch/arm/boot/dts/dove-cubox.dts                   |  40 +++++-
 arch/arm/boot/dts/kirkwood-6282.dtsi               |  17 +++
 arch/arm/boot/dts/kirkwood-dreamplug.dts           |   7 ++
 .../arm/boot/dts/kirkwood-guruplug-server-plus.dts |  94 ++++++++++++++
 arch/arm/boot/dts/kirkwood-mplcec4.dts             |  11 +-
 arch/arm/boot/dts/kirkwood-ns2-common.dtsi         |  16 +++
 arch/arm/boot/dts/kirkwood-openblocks_a6.dts       | 116 ++++++++++++++++++
 arch/arm/boot/dts/kirkwood.dtsi                    |   8 ++
 arch/arm/configs/mvebu_defconfig                   |   9 ++
 arch/arm/mach-dove/Kconfig                         |   2 +
 arch/arm/mach-kirkwood/Kconfig                     |   7 ++
 arch/arm/mach-kirkwood/Makefile                    |   1 +
 arch/arm/mach-kirkwood/board-dreamplug.c           |   6 -
 arch/arm/mach-kirkwood/board-dt.c                  |   4 +
 arch/arm/mach-kirkwood/board-guruplug.c            |  39 ++++++
 arch/arm/mach-kirkwood/board-ib62x0.c              |   1 -
 arch/arm/mach-kirkwood/board-mplcec4.c             |   8 --
 arch/arm/mach-kirkwood/board-ns2.c                 |  38 ------
 arch/arm/mach-kirkwood/board-openblocks_a6.c       |  44 -------
 arch/arm/mach-kirkwood/common.h                    |   5 +
 arch/arm/mach-kirkwood/dockstar-setup.c            |   1 -
 arch/arm/mach-kirkwood/pcie.c                      |  10 +-
 arch/arm/mach-mvebu/irq-armada-370-xp.c            |  72 +++++++++++
 drivers/mmc/host/mvsdio.c                          | 136 +++++++++------------
 drivers/rtc/Kconfig                                |   2 +-
 36 files changed, 629 insertions(+), 219 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt
 create mode 100644 arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
 create mode 100644 arch/arm/mach-kirkwood/board-guruplug.c

[GIT PULL 1/4] ARM: mvebu: cleanup for v3.9

[Jason Cooper]

The following changes since commit d1c3ed669a2d452cacfb48c2d171a1f364dae2ed:

  Linux 3.8-rc2 (2013-01-02 18:13:21 -0800)

are available in the git repository at:

  git://git.infradead.org/users/jcooper/linux.git tags/cleanup_for_v3.9

for you to fetch changes up to b96e1b1c3c5319294edb0970b6d5bf099c0e85eb:

  ARM: Kirkwood: Cleanup unneeded include files (2013-01-12 21:50:10 +0000)

----------------------------------------------------------------
mvebu cleanup for v3.9
 - remove unneeded includes due to DT conversion

----------------------------------------------------------------
Andrew Lunn (1):
      ARM: Kirkwood: Cleanup unneeded include files

Thomas Petazzoni (1):
      arm: kirkwood: dockstar: remove useless include of SDIO header

 arch/arm/mach-kirkwood/board-ib62x0.c   | 1 -
 arch/arm/mach-kirkwood/board-mplcec4.c  | 1 -
 arch/arm/mach-kirkwood/dockstar-setup.c | 1 -
 3 files changed, 3 deletions(-)

[GIT PULL 2/4] ARM: mvebu: drivers for v3.9

[Jason Cooper]

The following changes since commit d1c3ed669a2d452cacfb48c2d171a1f364dae2ed:

  Linux 3.8-rc2 (2013-01-02 18:13:21 -0800)

are available in the git repository at:

  git://git.infradead.org/users/jcooper/linux.git tags/drivers_for_v3.9

for you to fetch changes up to a6ae83d745063fee77648afc95de58d7a82d4df5:

  mmc: mvsdio: add pinctrl integration (2013-01-10 02:46:59 +0000)

----------------------------------------------------------------
mvebu drivers for v3.9
 - mvsdio
   - use slot-gpio for card detect and write protect
   - add DT binding
   - add pinctrl integration
 - use rtc-mv in mvebu armv7 SoCs
 - add pci-e hotplug for kirkwood

----------------------------------------------------------------
Gregory CLEMENT (1):
      rtc: Add support of rtc-mv for MVEBU SoCs

Jason Gunthorpe (1):
      ARM: Kirkwood: Support basic hotplug for PCI-E

Thomas Petazzoni (4):
      mmc: mvsdio: use slot-gpio infrastructure for write protect gpio
      mmc: mvsdio: use slot-gpio for card detect gpio
      mmc: mvsdio: implement a Device Tree binding
      mmc: mvsdio: add pinctrl integration

 .../devicetree/bindings/mmc/orion-sdio.txt         |  17 +++
 arch/arm/mach-kirkwood/pcie.c                      |  10 +-
 drivers/mmc/host/mvsdio.c                          | 136 +++++++++------------
 drivers/rtc/Kconfig                                |   2 +-
 4 files changed, 82 insertions(+), 83 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt

[GIT PULL 3/4] ARM: mvebu: boards for v3.9

[Jason Cooper]

The following changes since commit d1c3ed669a2d452cacfb48c2d171a1f364dae2ed:

  Linux 3.8-rc2 (2013-01-02 18:13:21 -0800)

are available in the git repository at:

  git://git.infradead.org/users/jcooper/linux.git tags/boards_for_v3.9

for you to fetch changes up to 3db7063cd2f8284190ef81e9dd0e9b902c73c5e9:

  arm: mvebu: enable btmrvl driver in mvebu_defconfig (2013-01-10 02:49:23 +0000)

----------------------------------------------------------------
mvebu boards for v3.9
 - Guruplug Server Plus DT board
 - mvebu improved SMP support in interrupt controller
 - update mvebu_defconfig

----------------------------------------------------------------
Gregory CLEMENT (4):
      arm: mvebu: Improve the SMP support of the interrupt controller
      ARM: mvebu: Fix interrupt handling in SMP mode
      rtc: Add support of rtc-mv for MVEBU SoCs
      arm: mvebu: Update defconfig with Marvell RTC support

Jason Cooper (2):
      Merge branch 'mvebu/drivers' into mvebu/boards
      Merge branch 'mvebu/drivers' into mvebu/boards

Jason Gunthorpe (1):
      ARM: Kirkwood: Support basic hotplug for PCI-E

Thomas Petazzoni (7):
      mmc: mvsdio: use slot-gpio infrastructure for write protect gpio
      mmc: mvsdio: use slot-gpio for card detect gpio
      mmc: mvsdio: implement a Device Tree binding
      mmc: mvsdio: add pinctrl integration
      arm: mvebu: enable SDIO support in mvebu_defconfig
      arm: mvebu: enable mwifiex driver in mvebu_defconfig
      arm: mvebu: enable btmrvl driver in mvebu_defconfig

Willy Tarreau (1):
      ARM: kirkwood: convert Guruplug Server Plus to use the device tree

 .../devicetree/bindings/mmc/orion-sdio.txt         |  17 +++
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/armada-xp.dtsi                   |   2 +-
 .../arm/boot/dts/kirkwood-guruplug-server-plus.dts |  94 ++++++++++++++
 arch/arm/configs/mvebu_defconfig                   |   9 ++
 arch/arm/mach-kirkwood/Kconfig                     |   7 ++
 arch/arm/mach-kirkwood/Makefile                    |   1 +
 arch/arm/mach-kirkwood/board-dt.c                  |   4 +
 arch/arm/mach-kirkwood/board-guruplug.c            |  39 ++++++
 arch/arm/mach-kirkwood/common.h                    |   5 +
 arch/arm/mach-kirkwood/pcie.c                      |  10 +-
 arch/arm/mach-mvebu/irq-armada-370-xp.c            |  72 +++++++++++
 drivers/mmc/host/mvsdio.c                          | 136 +++++++++------------
 drivers/rtc/Kconfig                                |   2 +-
 14 files changed, 315 insertions(+), 84 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt
 create mode 100644 arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
 create mode 100644 arch/arm/mach-kirkwood/board-guruplug.c

[GIT PULL 4/4] ARM: mvebu: dt for v3.9

[Jason Cooper]

The following changes since commit d1c3ed669a2d452cacfb48c2d171a1f364dae2ed:

  Linux 3.8-rc2 (2013-01-02 18:13:21 -0800)

are available in the git repository at:

  git://git.infradead.org/users/jcooper/linux.git tags/dt_for_v3.9

for you to fetch changes up to 877ddfac50bfeabc4729d0b8ac41989d226148b9:

  ARM: Dove: add fixed regulator for CuBox USB power (2013-01-12 22:35:56 +0000)

----------------------------------------------------------------
mvebu dt changes for v3.9
 - mvebu
   - add rtc support
   - add sdio support
 - kirkwood
   - add sdio support
   - add twsi1 and nand to 88f6282
   - convert openblocks A6 to pinctrl
 - dove
   - move led pinctrl to gpio-leds node
   - use fixed regulator for usb power

----------------------------------------------------------------
Andrew Lunn (5):
      ARM: Kirkwood: Fix missing clk for USB device.
      Power: gpio-poweroff: Fix documentation and gpio_is_valid
      ARM: Kirkwood: Fix missing sdio clock
      ARM: Kirkwood: Use fixed-regulator instead of board gpio call
      arm: mvebu: Add missing ; for cpu node.

Gregory CLEMENT (7):
      arm: mvebu: Use dw-apb-uart instead of ns16650 as UART driver
      arm: mvebu: Improve the SMP support of the interrupt controller
      ARM: mvebu: Fix interrupt handling in SMP mode
      rtc: Add support of rtc-mv for MVEBU SoCs
      arm: mvebu: Update defconfig with Marvell RTC support
      arm: mvebu: Add RTC support for Armada 370 and Armada XP
      arm: mvebu: Fix memory size for Armada 370 DB

Jason Cooper (4):
      Merge branch 'mvebu/drivers' into mvebu/boards
      Merge branch 'mvebu/drivers' into mvebu/boards
      Merge branch 'mvebu/boards' into mvebu/dt
      Merge branch 'mvebu/fixes' into mvebu/dt

Jason Gunthorpe (1):
      ARM: Kirkwood: Support basic hotplug for PCI-E

Joshua Coombs (1):
      clk: mvebu: Remove inappropriate __init tagging

Nobuhiro Iwamatsu (4):
      ARM: Kirkwood: Switch TWSI1 of 88f6282 to DT clock providers
      ARM: Kirkwood: Add pinctrl of TWSI1 to 88f6282
      ARM: Kirkwood: Add pinctrl of NAND to 88f6282
      ARM: Kirkwood: Convert openblocks A6 board to pinctrl

Sebastian Hesselbarth (5):
      ARM: Dove: Add pinctrl clock to DT
      pinctrl: mvebu: make pdma clock on dove mandatory
      ARM: Dove: add Cubox sdhci card detect gpio
      ARM: Dove: move CuBox led pinctrl to gpio-leds node
      ARM: Dove: add fixed regulator for CuBox USB power

Simon Guinot (1):
      ARM: Kirkwood: fix ns2 gpios by converting to pinctrl

Thomas Petazzoni (22):
      arm: mvebu: Armada XP MV78230 has two cores, not one
      arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces
      dma: mv_xor: fix error handling of mv_xor_channel_add()
      dma: mv_xor: fix error handling for clocks
      arm: mvebu: use global interrupts for GPIOs on Armada XP
      mmc: mvsdio: use slot-gpio infrastructure for write protect gpio
      mmc: mvsdio: use slot-gpio for card detect gpio
      mmc: mvsdio: implement a Device Tree binding
      mmc: mvsdio: add pinctrl integration
      arm: mvebu: enable SDIO support in mvebu_defconfig
      arm: mvebu: enable mwifiex driver in mvebu_defconfig
      arm: mvebu: enable btmrvl driver in mvebu_defconfig
      arm: mvebu: add DT information for the SDIO interface of Armada 370/XP
      arm: mvebu: add pin muxing options for the SDIO interface on Armada 370
      arm: mvebu: add pin muxing options for the SDIO interface on Armada XP
      arm: mvebu: enable the SD card slot on Armada XP DB board
      arm: mvebu: enable the SD card slot on Armada 370 DB board
      arm: mvebu: enable the SDIO interface on the Globalscale Mirabox
      arm: kirkwood: add Device Tree informations for the SDIO controller
      arm: kirkwood: dreamplug: use Device Tree to probe SDIO
      arm: kirkwood: mplcec4: use Device Tree to probe SDIO
      arm: kirkwood: add pinmux option for the SDIO interface on 88F6282

Willy Tarreau (1):
      ARM: kirkwood: convert Guruplug Server Plus to use the device tree

 .../devicetree/bindings/gpio/gpio-poweroff.txt     |  20 ++-
 .../devicetree/bindings/mmc/orion-sdio.txt         |  17 +++
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/armada-370-db.dts                |  17 ++-
 arch/arm/boot/dts/armada-370-mirabox.dts           |  10 ++
 arch/arm/boot/dts/armada-370-xp.dtsi               |  20 ++-
 arch/arm/boot/dts/armada-370.dtsi                  |  12 ++
 arch/arm/boot/dts/armada-xp-db.dts                 |   7 ++
 arch/arm/boot/dts/armada-xp-mv78230.dtsi           |  29 +++--
 arch/arm/boot/dts/armada-xp-mv78260.dtsi           |  35 ++++--
 arch/arm/boot/dts/armada-xp-mv78460.dtsi           |  35 ++++--
 arch/arm/boot/dts/armada-xp.dtsi                   |  16 +--
 arch/arm/boot/dts/dove-cubox.dts                   |  40 +++++-
 arch/arm/boot/dts/dove.dtsi                        |   1 +
 arch/arm/boot/dts/kirkwood-6282.dtsi               |  18 +++
 arch/arm/boot/dts/kirkwood-dreamplug.dts           |   7 ++
 .../arm/boot/dts/kirkwood-guruplug-server-plus.dts |  94 ++++++++++++++
 arch/arm/boot/dts/kirkwood-mplcec4.dts             |  11 +-
 arch/arm/boot/dts/kirkwood-ns2-common.dtsi         |  16 +++
 arch/arm/boot/dts/kirkwood-openblocks_a6.dts       | 116 ++++++++++++++++++
 arch/arm/boot/dts/kirkwood-topkick.dts             |  17 +++
 arch/arm/boot/dts/kirkwood.dtsi                    |   9 ++
 arch/arm/configs/mvebu_defconfig                   |  13 +-
 arch/arm/mach-dove/Kconfig                         |   2 +
 arch/arm/mach-kirkwood/Kconfig                     |   7 ++
 arch/arm/mach-kirkwood/Makefile                    |   1 +
 arch/arm/mach-kirkwood/board-dreamplug.c           |   6 -
 arch/arm/mach-kirkwood/board-dt.c                  |   8 ++
 arch/arm/mach-kirkwood/board-guruplug.c            |  39 ++++++
 arch/arm/mach-kirkwood/board-mplcec4.c             |   7 --
 arch/arm/mach-kirkwood/board-ns2.c                 |  38 ------
 arch/arm/mach-kirkwood/board-openblocks_a6.c       |  44 -------
 arch/arm/mach-kirkwood/board-usi_topkick.c         |   4 -
 arch/arm/mach-kirkwood/common.h                    |   5 +
 arch/arm/mach-kirkwood/pcie.c                      |  10 +-
 arch/arm/mach-mvebu/irq-armada-370-xp.c            |  72 +++++++++++
 drivers/clk/mvebu/clk-gating-ctrl.c                |   2 +-
 drivers/dma/mv_xor.c                               |   9 +-
 drivers/mmc/host/mvsdio.c                          | 136 +++++++++------------
 drivers/pinctrl/mvebu/pinctrl-dove.c               |   7 +-
 drivers/power/reset/gpio-poweroff.c                |  33 +++--
 drivers/rtc/Kconfig                                |   2 +-
 42 files changed, 730 insertions(+), 263 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt
 create mode 100644 arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
 create mode 100644 arch/arm/mach-kirkwood/board-guruplug.c

[GIT PULL 2/4] ARM: mvebu: drivers for v3.9

[Russell King - ARM Linux]

On Sat, Jan 12, 2013 at 11:29:16PM +0000, Jason Cooper wrote:
> Thomas Petazzoni (4):
>       mmc: mvsdio: use slot-gpio infrastructure for write protect gpio
>       mmc: mvsdio: use slot-gpio for card detect gpio
>       mmc: mvsdio: implement a Device Tree binding
>       mmc: mvsdio: add pinctrl integration

Does this include the fixes for the really broken stuff in that driver?
If not, hold off on this until it's fixed.  The current state of the
driver is rather BROKEN and it needs fixing in -rc.  It would be best
to get it fixed there _then_ base development on top of that to avoid
conflicts.

[GIT PULL 3/4] ARM: mvebu: boards for v3.9

[Russell King - ARM Linux]

On Sat, Jan 12, 2013 at 11:29:20PM +0000, Jason Cooper wrote:
> ----------------------------------------------------------------
> mvebu boards for v3.9
>  - Guruplug Server Plus DT board
>  - mvebu improved SMP support in interrupt controller
>  - update mvebu_defconfig

And a not specified dependency on pull request 2.

[GIT PULL 4/4] ARM: mvebu: dt for v3.9

[Russell King - ARM Linux]

On Sat, Jan 12, 2013 at 11:29:24PM +0000, Jason Cooper wrote:
> The following changes since commit d1c3ed669a2d452cacfb48c2d171a1f364dae2ed:
> 
>   Linux 3.8-rc2 (2013-01-02 18:13:21 -0800)
> 
> are available in the git repository at:
> 
>   git://git.infradead.org/users/jcooper/linux.git tags/dt_for_v3.9
> 
> for you to fetch changes up to 877ddfac50bfeabc4729d0b8ac41989d226148b9:
> 
>   ARM: Dove: add fixed regulator for CuBox USB power (2013-01-12 22:35:56 +0000)
> 
> ----------------------------------------------------------------
> mvebu dt changes for v3.9
>  - mvebu
>    - add rtc support
>    - add sdio support
>  - kirkwood
>    - add sdio support
>    - add twsi1 and nand to 88f6282
>    - convert openblocks A6 to pinctrl
>  - dove
>    - move led pinctrl to gpio-leds node
>    - use fixed regulator for usb power

And a note specified dependency on previous pull requests...

[GIT PULL 2/4] ARM: mvebu: drivers for v3.9

[Jason Cooper]

On Sun, Jan 13, 2013 at 01:05:35AM +0000, Russell King - ARM Linux wrote:
> On Sat, Jan 12, 2013 at 11:29:16PM +0000, Jason Cooper wrote:
> > Thomas Petazzoni (4):
> >       mmc: mvsdio: use slot-gpio infrastructure for write protect gpio
> >       mmc: mvsdio: use slot-gpio for card detect gpio
> >       mmc: mvsdio: implement a Device Tree binding
> >       mmc: mvsdio: add pinctrl integration
> 
> Does this include the fixes for the really broken stuff in that driver?
> If not, hold off on this until it's fixed.  The current state of the
> driver is rather BROKEN and it needs fixing in -rc.  It would be best
> to get it fixed there _then_ base development on top of that to avoid
> conflicts.

Ahh, I found the thread you were referring to.  I'll take a look at it
tonight or tomorrow.

thx,

Jason.

[GIT PULL 4/4] ARM: mvebu: dt for v3.9

[Jason Cooper]

On Sun, Jan 13, 2013 at 01:06:58AM +0000, Russell King - ARM Linux wrote:
> On Sat, Jan 12, 2013 at 11:29:24PM +0000, Jason Cooper wrote:
> > The following changes since commit d1c3ed669a2d452cacfb48c2d171a1f364dae2ed:
> > 
> >   Linux 3.8-rc2 (2013-01-02 18:13:21 -0800)
> > 
> > are available in the git repository at:
> > 
> >   git://git.infradead.org/users/jcooper/linux.git tags/dt_for_v3.9
> > 
> > for you to fetch changes up to 877ddfac50bfeabc4729d0b8ac41989d226148b9:
> > 
> >   ARM: Dove: add fixed regulator for CuBox USB power (2013-01-12 22:35:56 +0000)
> > 
> > ----------------------------------------------------------------
> > mvebu dt changes for v3.9
> >  - mvebu
> >    - add rtc support
> >    - add sdio support
> >  - kirkwood
> >    - add sdio support
> >    - add twsi1 and nand to 88f6282
> >    - convert openblocks A6 to pinctrl
> >  - dove
> >    - move led pinctrl to gpio-leds node
> >    - use fixed regulator for usb power
> 
> And a note specified dependency on previous pull requests...

oops, you're right.  I'll update them in V2 after we get the mvsdio
driver in better shape.

thx,

Jason.

[GIT PULL V2 0/4] ARM: mvebu: changes for v3.9

[Jason Cooper]

The following changes since commit 4b53ab9cb853e446f628e561ce6fcc527df30a76:

  Merge branch 'mvebu/fixes' into mvebu/drivers (2013-01-23 01:42:14 +0000)

are available in the git repository at:


  git://git.infradead.org/users/jcooper/linux.git mvebu/for-next

for you to fetch changes up to bf70a4aed75cdcfc765f896916cec73d3f94f3ec:

  Merge branch 'mvebu/dt' into mvebu/for-next (2013-01-23 02:42:39 +0000)

----------------------------------------------------------------

Andrew Lunn (1):
      ARM: Kirkwood: Cleanup unneeded include files

Gregory CLEMENT (2):
      arm: mvebu: Update defconfig with Marvell RTC support
      arm: mvebu: Add RTC support for Armada 370 and Armada XP

Jason Cooper (4):
      Merge branch 'mvebu/cleanup' into mvebu/for-next
      Merge branch 'mvebu/drivers' into mvebu/for-next
      Merge branch 'mvebu/boards' into mvebu/for-next
      Merge branch 'mvebu/dt' into mvebu/for-next

Nobuhiro Iwamatsu (3):
      ARM: Kirkwood: Add pinctrl of TWSI1 to 88f6282
      ARM: Kirkwood: Add pinctrl of NAND to 88f6282
      ARM: Kirkwood: Convert openblocks A6 board to pinctrl

Sebastian Hesselbarth (2):
      ARM: Dove: move CuBox led pinctrl to gpio-leds node
      ARM: Dove: add fixed regulator for CuBox USB power

Thomas Petazzoni (18):
      arm: kirkwood: dockstar: remove useless include of SDIO header
      mmc: mvsdio: use slot-gpio infrastructure for write protect gpio
      mmc: mvsdio: use slot-gpio for card detect gpio
      mmc: mvsdio: implement a Device Tree binding
      mmc: mvsdio: add pinctrl integration
      arm: mvebu: enable SDIO support in mvebu_defconfig
      arm: mvebu: enable mwifiex driver in mvebu_defconfig
      arm: mvebu: enable btmrvl driver in mvebu_defconfig
      arm: mvebu: add DT information for the SDIO interface of Armada 370/XP
      arm: mvebu: add pin muxing options for the SDIO interface on Armada 370
      arm: mvebu: add pin muxing options for the SDIO interface on Armada XP
      arm: mvebu: enable the SD card slot on Armada XP DB board
      arm: mvebu: enable the SD card slot on Armada 370 DB board
      arm: mvebu: enable the SDIO interface on the Globalscale Mirabox
      arm: kirkwood: add Device Tree informations for the SDIO controller
      arm: kirkwood: dreamplug: use Device Tree to probe SDIO
      arm: kirkwood: mplcec4: use Device Tree to probe SDIO
      arm: kirkwood: add pinmux option for the SDIO interface on 88F6282

 .../devicetree/bindings/mmc/orion-sdio.txt         |  17 +++
 arch/arm/boot/dts/armada-370-db.dts                |  15 +++
 arch/arm/boot/dts/armada-370-mirabox.dts           |  10 ++
 arch/arm/boot/dts/armada-370-xp.dtsi               |  14 +++
 arch/arm/boot/dts/armada-370.dtsi                  |  12 ++
 arch/arm/boot/dts/armada-xp-db.dts                 |   7 ++
 arch/arm/boot/dts/armada-xp-mv78230.dtsi           |   6 +
 arch/arm/boot/dts/armada-xp-mv78260.dtsi           |   6 +
 arch/arm/boot/dts/armada-xp-mv78460.dtsi           |   6 +
 arch/arm/boot/dts/dove-cubox.dts                   |  28 ++++-
 arch/arm/boot/dts/kirkwood-6282.dtsi               |  17 +++
 arch/arm/boot/dts/kirkwood-dreamplug.dts           |   7 ++
 arch/arm/boot/dts/kirkwood-mplcec4.dts             |  11 +-
 arch/arm/boot/dts/kirkwood-openblocks_a6.dts       | 116 ++++++++++++++++++
 arch/arm/boot/dts/kirkwood.dtsi                    |   8 ++
 arch/arm/configs/mvebu_defconfig                   |   9 ++
 arch/arm/mach-dove/Kconfig                         |   2 +
 arch/arm/mach-kirkwood/board-dreamplug.c           |   6 -
 arch/arm/mach-kirkwood/board-ib62x0.c              |   1 -
 arch/arm/mach-kirkwood/board-mplcec4.c             |   8 --
 arch/arm/mach-kirkwood/board-openblocks_a6.c       |  44 -------
 arch/arm/mach-kirkwood/dockstar-setup.c            |   1 -
 drivers/mmc/host/mvsdio.c                          | 129 ++++++++++-----------
 23 files changed, 351 insertions(+), 129 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt

[GIT PULL V2 1/4] ARM: mvebu: cleanup for v3.9

[Jason Cooper]

The following changes since commit d1c3ed669a2d452cacfb48c2d171a1f364dae2ed:

  Linux 3.8-rc2 (2013-01-02 18:13:21 -0800)

are available in the git repository at:

  git://git.infradead.org/users/jcooper/linux.git tags/cleanup_for_v3.9

for you to fetch changes up to b96e1b1c3c5319294edb0970b6d5bf099c0e85eb:

  ARM: Kirkwood: Cleanup unneeded include files (2013-01-12 21:50:10 +0000)

----------------------------------------------------------------
mvebu cleanup for v3.9
 - remove unneeded includes due to DT conversion

----------------------------------------------------------------
Andrew Lunn (1):
      ARM: Kirkwood: Cleanup unneeded include files

Thomas Petazzoni (1):
      arm: kirkwood: dockstar: remove useless include of SDIO header

 arch/arm/mach-kirkwood/board-ib62x0.c   | 1 -
 arch/arm/mach-kirkwood/board-mplcec4.c  | 1 -
 arch/arm/mach-kirkwood/dockstar-setup.c | 1 -
 3 files changed, 3 deletions(-)

[GIT PULL V2 2/4] ARM: mvebu: drivers for v3.9

[Jason Cooper]

The following changes since commit 4b53ab9cb853e446f628e561ce6fcc527df30a76:

  Merge branch 'mvebu/fixes' into mvebu/drivers (2013-01-23 01:42:14 +0000)

are available in the git repository at:


  git://git.infradead.org/users/jcooper/linux.git tags/drivers_for_v3.9

for you to fetch changes up to 43076a4c4e5fb92721bedc5d05b93468d6d76b2c:

  mmc: mvsdio: add pinctrl integration (2013-01-23 01:42:29 +0000)

----------------------------------------------------------------
mvebu drivers for v3.9
 - mvsdio
   - use slot-gpio for card detect and write protect
   - add DT binding
   - add pinctrl integration
 - use rtc-mv in mvebu armv7 SoCs
 - add pci-e hotplug for kirkwood

depends on:
 - mvebu/fixes

----------------------------------------------------------------
Thomas Petazzoni (4):
      mmc: mvsdio: use slot-gpio infrastructure for write protect gpio
      mmc: mvsdio: use slot-gpio for card detect gpio
      mmc: mvsdio: implement a Device Tree binding
      mmc: mvsdio: add pinctrl integration

 .../devicetree/bindings/mmc/orion-sdio.txt         |  17 +++
 drivers/mmc/host/mvsdio.c                          | 129 ++++++++++-----------
 2 files changed, 80 insertions(+), 66 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt

[GIT PULL V2 3/4] ARM: mvebu: boards for v3.9

[Jason Cooper]

The following changes since commit 43076a4c4e5fb92721bedc5d05b93468d6d76b2c:

  mmc: mvsdio: add pinctrl integration (2013-01-23 01:42:29 +0000)

are available in the git repository at:

  git://git.infradead.org/users/jcooper/linux.git tags/boards_for_v3.9

for you to fetch changes up to 6c00ce51dd26ffcd978c657533a71af32dbf2793:

  arm: mvebu: enable btmrvl driver in mvebu_defconfig (2013-01-23 01:57:37 +0000)

----------------------------------------------------------------
mvebu boards for v3.9
 - Guruplug Server Plus DT board
 - mvebu improved SMP support in interrupt controller
 - update mvebu_defconfig

depends on:
 - mvebu/fixes
 - mvebu/drivers

----------------------------------------------------------------
Gregory CLEMENT (1):
      arm: mvebu: Update defconfig with Marvell RTC support

Thomas Petazzoni (3):
      arm: mvebu: enable SDIO support in mvebu_defconfig
      arm: mvebu: enable mwifiex driver in mvebu_defconfig
      arm: mvebu: enable btmrvl driver in mvebu_defconfig

 arch/arm/configs/mvebu_defconfig | 9 +++++++++
 1 file changed, 9 insertions(+)

[GIT PULL V2 4/4] ARM: mvebu: dt for v3.9

[Jason Cooper]

The following changes since commit 6c00ce51dd26ffcd978c657533a71af32dbf2793:

  arm: mvebu: enable btmrvl driver in mvebu_defconfig (2013-01-23 01:57:37 +0000)

are available in the git repository at:

  git://git.infradead.org/users/jcooper/linux.git tags/dt_for_v3.9

for you to fetch changes up to 68f4d9ecc4512aa5680f897187d607be91a3f95b:

  ARM: Dove: add fixed regulator for CuBox USB power (2013-01-23 02:07:09 +0000)

----------------------------------------------------------------
mvebu dt changes for v3.9
 - mvebu
   - add rtc support
   - add sdio support
 - kirkwood
   - add sdio support
   - add twsi1 and nand to 88f6282
   - convert openblocks A6 to pinctrl
 - dove
   - move led pinctrl to gpio-leds node
   - use fixed regulator for usb power

depends on:
 - mvebu/fixes
 - mvebu/drivers
 - mvebu/boards

----------------------------------------------------------------
Gregory CLEMENT (1):
      arm: mvebu: Add RTC support for Armada 370 and Armada XP

Nobuhiro Iwamatsu (3):
      ARM: Kirkwood: Add pinctrl of TWSI1 to 88f6282
      ARM: Kirkwood: Add pinctrl of NAND to 88f6282
      ARM: Kirkwood: Convert openblocks A6 board to pinctrl

Sebastian Hesselbarth (2):
      ARM: Dove: move CuBox led pinctrl to gpio-leds node
      ARM: Dove: add fixed regulator for CuBox USB power

Thomas Petazzoni (10):
      arm: mvebu: add DT information for the SDIO interface of Armada 370/XP
      arm: mvebu: add pin muxing options for the SDIO interface on Armada 370
      arm: mvebu: add pin muxing options for the SDIO interface on Armada XP
      arm: mvebu: enable the SD card slot on Armada XP DB board
      arm: mvebu: enable the SD card slot on Armada 370 DB board
      arm: mvebu: enable the SDIO interface on the Globalscale Mirabox
      arm: kirkwood: add Device Tree informations for the SDIO controller
      arm: kirkwood: dreamplug: use Device Tree to probe SDIO
      arm: kirkwood: mplcec4: use Device Tree to probe SDIO
      arm: kirkwood: add pinmux option for the SDIO interface on 88F6282

 arch/arm/boot/dts/armada-370-db.dts          |  15 ++++
 arch/arm/boot/dts/armada-370-mirabox.dts     |  10 +++
 arch/arm/boot/dts/armada-370-xp.dtsi         |  14 ++++
 arch/arm/boot/dts/armada-370.dtsi            |  12 +++
 arch/arm/boot/dts/armada-xp-db.dts           |   7 ++
 arch/arm/boot/dts/armada-xp-mv78230.dtsi     |   6 ++
 arch/arm/boot/dts/armada-xp-mv78260.dtsi     |   6 ++
 arch/arm/boot/dts/armada-xp-mv78460.dtsi     |   6 ++
 arch/arm/boot/dts/dove-cubox.dts             |  28 ++++++-
 arch/arm/boot/dts/kirkwood-6282.dtsi         |  17 ++++
 arch/arm/boot/dts/kirkwood-dreamplug.dts     |   7 ++
 arch/arm/boot/dts/kirkwood-mplcec4.dts       |  11 ++-
 arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 116 +++++++++++++++++++++++++++
 arch/arm/boot/dts/kirkwood.dtsi              |   8 ++
 arch/arm/mach-dove/Kconfig                   |   2 +
 arch/arm/mach-kirkwood/board-dreamplug.c     |   6 --
 arch/arm/mach-kirkwood/board-mplcec4.c       |   7 --
 arch/arm/mach-kirkwood/board-openblocks_a6.c |  44 ----------
 18 files changed, 262 insertions(+), 60 deletions(-)

[GIT PULL V2 2/4] ARM: mvebu: drivers for v3.9

[Olof Johansson]

On Wed, Jan 23, 2013 at 02:48:05AM +0000, Jason Cooper wrote:
> The following changes since commit 4b53ab9cb853e446f628e561ce6fcc527df30a76:
> 
>   Merge branch 'mvebu/fixes' into mvebu/drivers (2013-01-23 01:42:14 +0000)
> 
> are available in the git repository at:
> 
> 
>   git://git.infradead.org/users/jcooper/linux.git tags/drivers_for_v3.9
> 
> for you to fetch changes up to 43076a4c4e5fb92721bedc5d05b93468d6d76b2c:
> 
>   mmc: mvsdio: add pinctrl integration (2013-01-23 01:42:29 +0000)
> 
> ----------------------------------------------------------------
> mvebu drivers for v3.9
>  - mvsdio
>    - use slot-gpio for card detect and write protect
>    - add DT binding
>    - add pinctrl integration
>  - use rtc-mv in mvebu armv7 SoCs
>  - add pci-e hotplug for kirkwood

Hi,

I didn't see any acks by Chris Ball on these, he's usually pretty
responsive on code reviews so I just wanted to make sure he's OK with
us taking this through arm-soc, and aware of it.

Looks like this whole branch could go through the mmc tree? The dtsi
updates from the last branch would still go through arm-soc.

Either way is fine with me, I just don't want to make life difficult for Chris
in case he has some sweeping changes planned that might cause conflicts, etc.


-Olof

[GIT PULL V2 1/4] ARM: mvebu: cleanup for v3.9

[Olof Johansson]

On Wed, Jan 23, 2013 at 02:48:03AM +0000, Jason Cooper wrote:
> The following changes since commit d1c3ed669a2d452cacfb48c2d171a1f364dae2ed:
> 
>   Linux 3.8-rc2 (2013-01-02 18:13:21 -0800)
> 
> are available in the git repository at:
> 
>   git://git.infradead.org/users/jcooper/linux.git tags/cleanup_for_v3.9
> 
> for you to fetch changes up to b96e1b1c3c5319294edb0970b6d5bf099c0e85eb:
> 
>   ARM: Kirkwood: Cleanup unneeded include files (2013-01-12 21:50:10 +0000)
> 
> ----------------------------------------------------------------
> mvebu cleanup for v3.9
>  - remove unneeded includes due to DT conversion
> 
> ----------------------------------------------------------------
> Andrew Lunn (1):
>       ARM: Kirkwood: Cleanup unneeded include files
> 
> Thomas Petazzoni (1):
>       arm: kirkwood: dockstar: remove useless include of SDIO header
> 
>  arch/arm/mach-kirkwood/board-ib62x0.c   | 1 -
>  arch/arm/mach-kirkwood/board-mplcec4.c  | 1 -
>  arch/arm/mach-kirkwood/dockstar-setup.c | 1 -
>  3 files changed, 3 deletions(-)

Hi,

This one I pulled as mvebu/cleanup. I'm holding off on the others based
on my reply, since the drivers branch is base for the later branches.


-Olof

[GIT PULL V2 2/4] ARM: mvebu: drivers for v3.9

[Chris Ball]

Hi,

On Mon, Jan 28 2013, Olof Johansson wrote:
> I didn't see any acks by Chris Ball on these, he's usually pretty
> responsive on code reviews so I just wanted to make sure he's OK with
> us taking this through arm-soc, and aware of it.
>
> Looks like this whole branch could go through the mmc tree? The dtsi
> updates from the last branch would still go through arm-soc.

Thanks for the ping, would be good to take these via mmc-next so I've
pushed the four new mvsdio patches there now:

mmc: mvsdio: add pinctrl integration
mmc: mvsdio: implement a Device Tree binding
mmc: mvsdio: use slot-gpio for card detect gpio
mmc: mvsdio: use slot-gpio infrastructure for write protect gpio

Hope that works okay for everyone,

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

[GIT PULL V2 2/4] ARM: mvebu: drivers for v3.9

[Jason Cooper]

On Mon, Jan 28, 2013 at 06:53:40AM -0500, Chris Ball wrote:
> Hi,
> 
> On Mon, Jan 28 2013, Olof Johansson wrote:
> > I didn't see any acks by Chris Ball on these, he's usually pretty
> > responsive on code reviews so I just wanted to make sure he's OK with
> > us taking this through arm-soc, and aware of it.
> >
> > Looks like this whole branch could go through the mmc tree? The dtsi
> > updates from the last branch would still go through arm-soc.
> 
> Thanks for the ping, would be good to take these via mmc-next so I've
> pushed the four new mvsdio patches there now:
> 
> mmc: mvsdio: add pinctrl integration
> mmc: mvsdio: implement a Device Tree binding
> mmc: mvsdio: use slot-gpio for card detect gpio
> mmc: mvsdio: use slot-gpio infrastructure for write protect gpio

Thanks Chris, I'll redo these and depend on mmc-next at

git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git

thx,

Jason.

[GIT PULL 3/4] ARM: mvebu: boards for v3.9

[Jason Cooper]

On Sat, Feb 09, 2013 at 04:31:13PM -0800, Olof Johansson wrote:
> On Wed, Feb 06, 2013 at 08:20:15AM -0500, Jason Cooper wrote:
> > On Tue, Feb 05, 2013 at 03:26:04PM -0800, Olof Johansson wrote:
> > > What makes sense is to hold off the patches that adds dts entries and
> > > removes the platform device registrations to the next release to avoid
> > > this dependency.
> > 
> > Hmm, this makes life a *lot* simpler, but it also really slows things
> > down.  I'll go ahead and do this from now on.
> > 
> > Would you like me to redo /boards and /dt in light of this, or just do
> > it from here forward?
> 
> It doesn't necessarily slow things down -- it increases latency though. I.e.
> you'll end up building a pipeline over time.

Yes, that's not a problem.

> I agree that we're not entirely clear on this, and we're also going back and
> forth a bit on how much of this we push back on and not. I don't think we've
> found quite a good balance of this yet. Hm.

Well, it appears to me the crux of it is: How hard is it to merge and
re-merge branches with dependencies on driver trees?  If it's a PITA,
then let's do as you've suggested.  A sane, but slower process will
incur fewer mistakes.

Also, we can sit down an go ever this (with a few beers) at ELC.  ;-)

I'll redo as you've suggested for this go-around, and we can hash it out
in a few weeks.

thx,

Jason.

[GIT PULL 3/4] ARM: mvebu: boards for v3.9

[Olof Johansson]

On Wed, Feb 06, 2013 at 08:20:15AM -0500, Jason Cooper wrote:
> On Tue, Feb 05, 2013 at 03:26:04PM -0800, Olof Johansson wrote:
> > What makes sense is to hold off the patches that adds dts entries and
> > removes the platform device registrations to the next release to avoid
> > this dependency.
> 
> Hmm, this makes life a *lot* simpler, but it also really slows things
> down.  I'll go ahead and do this from now on.
> 
> Would you like me to redo /boards and /dt in light of this, or just do
> it from here forward?

It doesn't necessarily slow things down -- it increases latency though. I.e.
you'll end up building a pipeline over time.

I agree that we're not entirely clear on this, and we're also going back and
forth a bit on how much of this we push back on and not. I don't think we've
found quite a good balance of this yet. Hm.


-Olof

[GIT PULL 3/4] ARM: mvebu: boards for v3.9

[Jason Cooper]

On Tue, Feb 05, 2013 at 03:26:04PM -0800, Olof Johansson wrote:
> What makes sense is to hold off the patches that adds dts entries and
> removes the platform device registrations to the next release to avoid
> this dependency.

Hmm, this makes life a *lot* simpler, but it also really slows things
down.  I'll go ahead and do this from now on.

Would you like me to redo /boards and /dt in light of this, or just do
it from here forward?

thx,

Jason.

[GIT PULL 3/4] ARM: mvebu: boards for v3.9

[Olof Johansson]

On Tue, Feb 05, 2013 at 01:30:50PM -0500, Jason Cooper wrote:
> On Tue, Feb 05, 2013 at 10:23:33AM -0800, Olof Johansson wrote:
> > On Tue, Feb 05, 2013 at 06:21:04AM -0500, Jason Cooper wrote:
> > > On Mon, Feb 04, 2013 at 11:10:10PM -0800, Olof Johansson wrote:
> > > > Hi,
> > > > 
> > > > On Fri, Feb 01, 2013 at 03:51:59PM +0000, Jason Cooper wrote:
> > > > > The following changes since commit 949db153b6466c6f7cad5a427ecea94985927311:
> > > > > 
> > > > >   Linux 3.8-rc5
> > > > > 
> > > > > are available in the git repository at:
> > > > > 
> > > > >   git://git.infradead.org/users/jcooper/linux.git tags/boards_for_v3.9
> > > > > 
> > > > > for you to fetch changes up to c7064904895f69b2e33117b450a05746f75abf3a:
> > > > > 
> > > > >   ARM: kirkwood: convert Guruplug Server Plus to use the device tree
> > > > > 
> > > > > ----------------------------------------------------------------
> > > > > mvebu boards for v3.9
> > > > >      - Guruplug Server Plus DT board
> > > > >      - RD-A370-A1 board
> > > > >      - mvebu improved SMP support in interrupt controller
> > > > >      - update defconfigs
> > > > >      - split legacy and DT setup for dove
> > > > >      - remove some redundant clock aliases
> > > > >     
> > > > >     depends on:
> > > > >      - tags/mvebu_fixes_for_v3.8-rc6
> > > > >      - tags/cleanup_for_v3.9_round2
> > > > >      - tags/drivers_for_v3.9
> > > > >      - mmc/mmc-next up to:
> > > > >         d293875 mmc: mvsdio: add pinctrl integration
> > > > 
> > > > Hm. What do you need the mmc branch for? Is it just the removal of the
> > > > redundant SDIO clock alias?
> > > 
> > > No, it's the four patches of Thomas' to the mvsdio driver:
> > > 
> > > d293875 mmc: mvsdio: add pinctrl integration
> > > 182ce21 mmc: mvsdio: implement a Device Tree binding
> > > aa3738e mmc: mvsdio: use slot-gpio for card detect gpio
> > > 9d8b28e5 mmc: mvsdio: use slot-gpio infrastructure for write protect gpio
> > > 
> > > which mvebu/boards needs before we can activate defconfig options.
> > 
> > Yeah, those are the patches you need to bring in. What I was wondering is why
> > you need to bring them in? If it's just for defconfig updates and a couple of
> > tiny cleanups, then I would say it's not worth the overhead of adding the
> > dependency branch to do those -- defconfig updates can go in anyway and the
> > cleanups can happen in the next release.
> 
> Well, I brought them in to mvebu/boards because of defconfig, but I
> need them in mvebu/dt (which depends on mvebu/boards) because we remove
> the legacy mvsdio init calls, and add the mvsdio dt blocks to the dts
> files.
> 
> Would you prefer I put all the defconfig changes into /dt since it's at
> the end of the dependency chain?

The defconfig changes can go in either branch. They end up selecting
new options that will be silently turned off unless the driver change
is also in the same tree, but that's not a big deal since things will
eventually converge.

What makes sense is to hold off the patches that adds dts entries and
removes the platform device registrations to the next release to avoid
this dependency.


-Olof

[GIT PULL 3/4] ARM: mvebu: boards for v3.9

[Jason Cooper]

On Tue, Feb 05, 2013 at 10:23:33AM -0800, Olof Johansson wrote:
> On Tue, Feb 05, 2013 at 06:21:04AM -0500, Jason Cooper wrote:
> > On Mon, Feb 04, 2013 at 11:10:10PM -0800, Olof Johansson wrote:
> > > Hi,
> > > 
> > > On Fri, Feb 01, 2013 at 03:51:59PM +0000, Jason Cooper wrote:
> > > > The following changes since commit 949db153b6466c6f7cad5a427ecea94985927311:
> > > > 
> > > >   Linux 3.8-rc5
> > > > 
> > > > are available in the git repository at:
> > > > 
> > > >   git://git.infradead.org/users/jcooper/linux.git tags/boards_for_v3.9
> > > > 
> > > > for you to fetch changes up to c7064904895f69b2e33117b450a05746f75abf3a:
> > > > 
> > > >   ARM: kirkwood: convert Guruplug Server Plus to use the device tree
> > > > 
> > > > ----------------------------------------------------------------
> > > > mvebu boards for v3.9
> > > >      - Guruplug Server Plus DT board
> > > >      - RD-A370-A1 board
> > > >      - mvebu improved SMP support in interrupt controller
> > > >      - update defconfigs
> > > >      - split legacy and DT setup for dove
> > > >      - remove some redundant clock aliases
> > > >     
> > > >     depends on:
> > > >      - tags/mvebu_fixes_for_v3.8-rc6
> > > >      - tags/cleanup_for_v3.9_round2
> > > >      - tags/drivers_for_v3.9
> > > >      - mmc/mmc-next up to:
> > > >         d293875 mmc: mvsdio: add pinctrl integration
> > > 
> > > Hm. What do you need the mmc branch for? Is it just the removal of the
> > > redundant SDIO clock alias?
> > 
> > No, it's the four patches of Thomas' to the mvsdio driver:
> > 
> > d293875 mmc: mvsdio: add pinctrl integration
> > 182ce21 mmc: mvsdio: implement a Device Tree binding
> > aa3738e mmc: mvsdio: use slot-gpio for card detect gpio
> > 9d8b28e5 mmc: mvsdio: use slot-gpio infrastructure for write protect gpio
> > 
> > which mvebu/boards needs before we can activate defconfig options.
> 
> Yeah, those are the patches you need to bring in. What I was wondering is why
> you need to bring them in? If it's just for defconfig updates and a couple of
> tiny cleanups, then I would say it's not worth the overhead of adding the
> dependency branch to do those -- defconfig updates can go in anyway and the
> cleanups can happen in the next release.

Well, I brought them in to mvebu/boards because of defconfig, but I
need them in mvebu/dt (which depends on mvebu/boards) because we remove
the legacy mvsdio init calls, and add the mvsdio dt blocks to the dts
files.

Would you prefer I put all the defconfig changes into /dt since it's at
the end of the dependency chain?

> > > Also, it's really hard to tell where code came from when you just merge in
> > > a hash like below:
> > > 
> > > > Jason Cooper (4):
> > > >       Merge tag 'tags/mvebu_fixes_for_v3.8-rc6' into mvebu/boards
> > > >       Merge tag 'tags/cleanup_for_v3.9_round2' into mvebu/boards
> > > >       Merge tag 'tags/drivers_for_v3.9' into mvebu/boards
> > > >       Merge commit 'd293875' into mvebu/boards
> > > 
> > > That's the mmc-next branch at that commit, but it'd be nice to have a
> > > more descriptive summary in the shortlog.
> > 
> > Agreed, I started doing this after the first time I pulled in pinctrl as
> > a dependency.  LinusW recommended pulling just up to the commit needed
> > so that if he did have to do a rebase, the closer it was to the tip of
> > his tree, the fewer people it would affect.
> > 
> > Would this be better?
> > 
> > "Merge mmc/mmc-next up to 'd293875' into mvebu/boards"
> 
> Yeah, that would have been better (but see above).

Ok, I'll do that in the future.

thx,

Jason.

[GIT PULL 3/4] ARM: mvebu: boards for v3.9

[Olof Johansson]

On Tue, Feb 05, 2013 at 06:21:04AM -0500, Jason Cooper wrote:
> On Mon, Feb 04, 2013 at 11:10:10PM -0800, Olof Johansson wrote:
> > Hi,
> > 
> > On Fri, Feb 01, 2013 at 03:51:59PM +0000, Jason Cooper wrote:
> > > The following changes since commit 949db153b6466c6f7cad5a427ecea94985927311:
> > > 
> > >   Linux 3.8-rc5
> > > 
> > > are available in the git repository at:
> > > 
> > >   git://git.infradead.org/users/jcooper/linux.git tags/boards_for_v3.9
> > > 
> > > for you to fetch changes up to c7064904895f69b2e33117b450a05746f75abf3a:
> > > 
> > >   ARM: kirkwood: convert Guruplug Server Plus to use the device tree
> > > 
> > > ----------------------------------------------------------------
> > > mvebu boards for v3.9
> > >      - Guruplug Server Plus DT board
> > >      - RD-A370-A1 board
> > >      - mvebu improved SMP support in interrupt controller
> > >      - update defconfigs
> > >      - split legacy and DT setup for dove
> > >      - remove some redundant clock aliases
> > >     
> > >     depends on:
> > >      - tags/mvebu_fixes_for_v3.8-rc6
> > >      - tags/cleanup_for_v3.9_round2
> > >      - tags/drivers_for_v3.9
> > >      - mmc/mmc-next up to:
> > >         d293875 mmc: mvsdio: add pinctrl integration
> > 
> > Hm. What do you need the mmc branch for? Is it just the removal of the
> > redundant SDIO clock alias?
> 
> No, it's the four patches of Thomas' to the mvsdio driver:
> 
> d293875 mmc: mvsdio: add pinctrl integration
> 182ce21 mmc: mvsdio: implement a Device Tree binding
> aa3738e mmc: mvsdio: use slot-gpio for card detect gpio
> 9d8b28e5 mmc: mvsdio: use slot-gpio infrastructure for write protect gpio
> 
> which mvebu/boards needs before we can activate defconfig options.

Yeah, those are the patches you need to bring in. What I was wondering is why
you need to bring them in? If it's just for defconfig updates and a couple of
tiny cleanups, then I would say it's not worth the overhead of adding the
dependency branch to do those -- defconfig updates can go in anyway and the
cleanups can happen in the next release.

> > Also, it's really hard to tell where code came from when you just merge in
> > a hash like below:
> > 
> > > Jason Cooper (4):
> > >       Merge tag 'tags/mvebu_fixes_for_v3.8-rc6' into mvebu/boards
> > >       Merge tag 'tags/cleanup_for_v3.9_round2' into mvebu/boards
> > >       Merge tag 'tags/drivers_for_v3.9' into mvebu/boards
> > >       Merge commit 'd293875' into mvebu/boards
> > 
> > That's the mmc-next branch at that commit, but it'd be nice to have a
> > more descriptive summary in the shortlog.
> 
> Agreed, I started doing this after the first time I pulled in pinctrl as
> a dependency.  LinusW recommended pulling just up to the commit needed
> so that if he did have to do a rebase, the closer it was to the tip of
> his tree, the fewer people it would affect.
> 
> Would this be better?
> 
> "Merge mmc/mmc-next up to 'd293875' into mvebu/boards"

Yeah, that would have been better (but see above).


-Olof

[GIT PULL 3/4] ARM: mvebu: boards for v3.9

[Jason Cooper]

On Mon, Feb 04, 2013 at 11:10:10PM -0800, Olof Johansson wrote:
> Hi,
> 
> On Fri, Feb 01, 2013 at 03:51:59PM +0000, Jason Cooper wrote:
> > The following changes since commit 949db153b6466c6f7cad5a427ecea94985927311:
> > 
> >   Linux 3.8-rc5
> > 
> > are available in the git repository at:
> > 
> >   git://git.infradead.org/users/jcooper/linux.git tags/boards_for_v3.9
> > 
> > for you to fetch changes up to c7064904895f69b2e33117b450a05746f75abf3a:
> > 
> >   ARM: kirkwood: convert Guruplug Server Plus to use the device tree
> > 
> > ----------------------------------------------------------------
> > mvebu boards for v3.9
> >      - Guruplug Server Plus DT board
> >      - RD-A370-A1 board
> >      - mvebu improved SMP support in interrupt controller
> >      - update defconfigs
> >      - split legacy and DT setup for dove
> >      - remove some redundant clock aliases
> >     
> >     depends on:
> >      - tags/mvebu_fixes_for_v3.8-rc6
> >      - tags/cleanup_for_v3.9_round2
> >      - tags/drivers_for_v3.9
> >      - mmc/mmc-next up to:
> >         d293875 mmc: mvsdio: add pinctrl integration
> 
> Hm. What do you need the mmc branch for? Is it just the removal of the
> redundant SDIO clock alias?

No, it's the four patches of Thomas' to the mvsdio driver:

d293875 mmc: mvsdio: add pinctrl integration
182ce21 mmc: mvsdio: implement a Device Tree binding
aa3738e mmc: mvsdio: use slot-gpio for card detect gpio
9d8b28e5 mmc: mvsdio: use slot-gpio infrastructure for write protect gpio

which mvebu/boards needs before we can activate defconfig options.

> Also, it's really hard to tell where code came from when you just merge in
> a hash like below:
> 
> > Jason Cooper (4):
> >       Merge tag 'tags/mvebu_fixes_for_v3.8-rc6' into mvebu/boards
> >       Merge tag 'tags/cleanup_for_v3.9_round2' into mvebu/boards
> >       Merge tag 'tags/drivers_for_v3.9' into mvebu/boards
> >       Merge commit 'd293875' into mvebu/boards
> 
> That's the mmc-next branch at that commit, but it'd be nice to have a
> more descriptive summary in the shortlog.

Agreed, I started doing this after the first time I pulled in pinctrl as
a dependency.  LinusW recommended pulling just up to the commit needed
so that if he did have to do a rebase, the closer it was to the tip of
his tree, the fewer people it would affect.

Would this be better?

"Merge mmc/mmc-next up to 'd293875' into mvebu/boards"

thx,

Jason.

[GIT PULL 3/4] ARM: mvebu: boards for v3.9

[Olof Johansson]

Hi,

On Fri, Feb 01, 2013 at 03:51:59PM +0000, Jason Cooper wrote:
> The following changes since commit 949db153b6466c6f7cad5a427ecea94985927311:
> 
>   Linux 3.8-rc5
> 
> are available in the git repository at:
> 
>   git://git.infradead.org/users/jcooper/linux.git tags/boards_for_v3.9
> 
> for you to fetch changes up to c7064904895f69b2e33117b450a05746f75abf3a:
> 
>   ARM: kirkwood: convert Guruplug Server Plus to use the device tree
> 
> ----------------------------------------------------------------
> mvebu boards for v3.9
>      - Guruplug Server Plus DT board
>      - RD-A370-A1 board
>      - mvebu improved SMP support in interrupt controller
>      - update defconfigs
>      - split legacy and DT setup for dove
>      - remove some redundant clock aliases
>     
>     depends on:
>      - tags/mvebu_fixes_for_v3.8-rc6
>      - tags/cleanup_for_v3.9_round2
>      - tags/drivers_for_v3.9
>      - mmc/mmc-next up to:
>         d293875 mmc: mvsdio: add pinctrl integration

Hm. What do you need the mmc branch for? Is it just the removal of the
redundant SDIO clock alias?

If so, I'd say let's keep that as a cleanup until 3.10 instead of bringing this
in as a dependency. If it's something more substantial than that, then let me
know and we'll still pull this in.

Also, it's really hard to tell where code came from when you just merge in
a hash like below:

> Jason Cooper (4):
>       Merge tag 'tags/mvebu_fixes_for_v3.8-rc6' into mvebu/boards
>       Merge tag 'tags/cleanup_for_v3.9_round2' into mvebu/boards
>       Merge tag 'tags/drivers_for_v3.9' into mvebu/boards
>       Merge commit 'd293875' into mvebu/boards

That's the mmc-next branch at that commit, but it'd be nice to have a
more descriptive summary in the shortlog.


-Olof

[GIT PULL 3/4] ARM: mvebu: boards for v3.9

[Jason Cooper]

The following changes since commit 949db153b6466c6f7cad5a427ecea94985927311:

  Linux 3.8-rc5

are available in the git repository at:

  git://git.infradead.org/users/jcooper/linux.git tags/boards_for_v3.9

for you to fetch changes up to c7064904895f69b2e33117b450a05746f75abf3a:

  ARM: kirkwood: convert Guruplug Server Plus to use the device tree

----------------------------------------------------------------
mvebu boards for v3.9
     - Guruplug Server Plus DT board
     - RD-A370-A1 board
     - mvebu improved SMP support in interrupt controller
     - update defconfigs
     - split legacy and DT setup for dove
     - remove some redundant clock aliases
    
    depends on:
     - tags/mvebu_fixes_for_v3.8-rc6
     - tags/cleanup_for_v3.9_round2
     - tags/drivers_for_v3.9
     - mmc/mmc-next up to:
        d293875 mmc: mvsdio: add pinctrl integration
    
    conflicts:
     - arm-soc/for-next
        - arch/arm/mach-dove/common.c
           * remove all DT code (it's now in .../board-dt.c)
    
    build fixes (not merge conflict)
     - arm-soc/for-next
        - arch/arm/mach-dove/board-dt.c
           - .timer no longer used
           * s/.timer = &dove_timer/.init_time = dove_timer_init/ (not valid sed)
----------------------------------------------------------------
Andrew Lunn (2):
      ARM: Kirkwood: Remove redundent USB clock alias
      ARM: Kirkwood: Remove redundent SDIO clock alias

Florian Fainelli (1):
      arm: mvebu: add DTS file for Marvell RD-A370-A1 board

Gregory CLEMENT (2):
      arm: mvebu: Update defconfig with Marvell RTC support
      arm: mvebu: Improve the SMP support of the interrupt controller

Jason Cooper (4):
      Merge tag 'tags/mvebu_fixes_for_v3.8-rc6' into mvebu/boards
      Merge tag 'tags/cleanup_for_v3.9_round2' into mvebu/boards
      Merge tag 'tags/drivers_for_v3.9' into mvebu/boards
      Merge commit 'd293875' into mvebu/boards

Olof Johansson (1):
      ARM: dove: update dove_defconfig with a few useful options

Sebastian Hesselbarth (1):
      ARM: Dove: split legacy and DT setup

Thomas Petazzoni (4):
      arm: mvebu: enable SDIO support in mvebu_defconfig
      arm: mvebu: enable mwifiex driver in mvebu_defconfig
      arm: mvebu: enable btmrvl driver in mvebu_defconfig
      arm: mvebu: add LEDs support to defconfig file

Willy Tarreau (1):
      ARM: kirkwood: convert Guruplug Server Plus to use the device tree

 .../bindings/mmc/brcm,bcm2835-sdhci.txt         |  18 ++
 .../devicetree/bindings/mmc/orion-sdio.txt      |  17 ++
 arch/arm/boot/dts/Makefile                      |   2 +
 arch/arm/boot/dts/armada-370-rd.dts             |  61 ++++
 arch/arm/boot/dts/armada-xp.dtsi                |   2 +-
 arch/arm/boot/dts/dove.dtsi                     |   2 +
 .../boot/dts/kirkwood-guruplug-server-plus.dts  |  94 +++++++
 arch/arm/configs/dove_defconfig                 |  28 +-
 arch/arm/configs/kirkwood_defconfig             |   1 +
 arch/arm/configs/mvebu_defconfig                |  16 ++
 arch/arm/mach-dove/Kconfig                      |   5 +
 arch/arm/mach-dove/Makefile                     |   4 +-
 arch/arm/mach-dove/board-dt.c                   | 102 +++++++
 arch/arm/mach-dove/common.c                     | 114 +-------
 arch/arm/mach-kirkwood/Kconfig                  |   7 +
 arch/arm/mach-kirkwood/Makefile                 |   2 +-
 arch/arm/mach-kirkwood/board-dt.c               |  15 +-
 arch/arm/mach-kirkwood/board-guruplug.c         |  39 +++
 arch/arm/mach-kirkwood/board-ib62x0.c           |   1 -
 arch/arm/mach-kirkwood/board-mplcec4.c          |   1 -
 arch/arm/mach-kirkwood/board-nsa310.c           |   8 +-
 arch/arm/mach-kirkwood/common.c                 |  23 ++
 arch/arm/mach-kirkwood/common.h                 |   6 +
 arch/arm/mach-kirkwood/dockstar-setup.c         |   1 -
 arch/arm/mach-kirkwood/include/mach/kirkwood.h  |   3 +-
 arch/arm/mach-kirkwood/pcie.c                   |  10 +-
 arch/arm/mach-mvebu/irq-armada-370-xp.c         |  72 +++++
 arch/arm/plat-orion/mpp.c                       |   2 +-
 drivers/cpuidle/Kconfig                         |   6 +
 drivers/cpuidle/Makefile                        |   1 +
 .../cpuidle/cpuidle-kirkwood.c                  |  45 ++-
 drivers/mmc/card/block.c                        |  30 +-
 drivers/mmc/card/queue.c                        |  32 ++-
 drivers/mmc/card/queue.h                        |   3 +
 drivers/mmc/core/bus.c                          |   1 +
 drivers/mmc/core/core.c                         | 121 +++++++-
 drivers/mmc/core/core.h                         |   1 +
 drivers/mmc/core/sdio.c                         |  33 ++-
 drivers/mmc/core/slot-gpio.c                    |  57 +++-
 drivers/mmc/host/Kconfig                        |  11 +
 drivers/mmc/host/Makefile                       |   1 +
 drivers/mmc/host/mvsdio.c                       | 131 +++++----
 drivers/mmc/host/sdhci-bcm2835.c                | 227 +++++++++++++++
 drivers/mmc/host/sdhci-esdhc-imx.c              |  59 +---
 drivers/mmc/host/sdhci-pxav3.c                  |  12 +-
 drivers/mmc/host/sdhci.c                        | 117 +++++---
 drivers/mmc/host/sh_mmcif.c                     | 280 +++++++++++--------
 drivers/mmc/host/tmio_mmc_pio.c                 |   8 -
 drivers/rtc/Kconfig                             |   2 +-
 include/linux/mmc/card.h                        |  12 +
 include/linux/mmc/core.h                        |   3 +-
 include/linux/mmc/host.h                        |  25 ++
 52 files changed, 1381 insertions(+), 493 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt
 create mode 100644 Documentation/devicetree/bindings/mmc/orion-sdio.txt
 create mode 100644 arch/arm/boot/dts/armada-370-rd.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
 create mode 100644 arch/arm/mach-dove/board-dt.c
 create mode 100644 arch/arm/mach-kirkwood/board-guruplug.c
 rename arch/arm/mach-kirkwood/cpuidle.c => drivers/cpuidle/cpuidle-kirkwood.c (61%)
 create mode 100644 drivers/mmc/host/sdhci-bcm2835.c