From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 19 Feb 2013 17:34:44 +0000 (+0100)
Subject: Merge tag 'dt_for_v3.9_round2' of git://git.infradead.org/users/jcooper/linux into... 
X-Git-Tag: next-20130220~18^2~5^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6a2af59c4e9940ca67b80bb4905c8b3741f66d2d;p=karo-tx-linux.git

Merge tag 'dt_for_v3.9_round2' of git://git.infradead.org/users/jcooper/linux into late/mvebu-dt

mvebu dt changes for v3.9 round2

 - mvebu
    - USB support
    - local timers
    - SPI controller and flash
    - SD slot on the Reference Design board

 - kirkwood
    - topkick pinctrl, i2c and mvsdio
    - nsa310 pinctrl

 - dove
    - USB support
    - use clocks instead of clock-frequency for serial

I included patches depending on the mvsdio changes Chris Ball took, since
tags/boards_for_v3.9 has been pulled with that dependency.

All other patches with external dependencies are going into a separate branch,
mvebu/dt_deps.  If necessary, they can wait for v3.10.

new depends:
 - mvebu/boards

new conflicts:
 - arch/arm/mach-kirkwood/board-nsa310.c
    - remove the gpio.h include line.

** below is from previous tag dt_for_v3.9 **
depends on:
 - tags/boards_for_v3.9, which pulls in:
    - 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

* tag 'dt_for_v3.9_round2' of git://git.infradead.org/users/jcooper/linux: (22 commits)
  arm: mvebu: enable the SD card slot on Armada 370 Reference Design board
  ARM: kirkwood: topkick: init mvsdio via DT
  ARM: kirkwood: nsa310: convert to pinctrl
  ARM: Kirkwood: topkick: Enable i2c bus.
  ARM: kirkwood: topkick: convert to pinctrl
  ARM: dove: convert serial DT nodes to clocks property
  arm: mvebu: Add SPI flash on Armada 370 DB board
  arm: mvebu: Add SPI flash on Armada XP-DB board
  arm: mvebu: Add SPI flash on Armada XP-GP board
  arm: mvebu: Add support for SPI controller in Armada 370/XP
  ARM: mvebu: Update defconfig to select SPI flash and MTD support
  ARM: mvebu: Update defconfig to select SPI support
  arm: mvebu: support for the new Armada XP development board(DB-MV784MP-GP)
  clocksource: update and move armada-370-xp-timer documentation to timer directory
  arm: mvebu: update DT to support local timers
  arm: mvebu: update defconfig with local timer support
  clocksource: time-armada-370-xp: add local timer support
  arm: mvebu: Add support for local interrupt
  ARM: Dove: convert usb host controller to DT
  arm: mvebu: Enable USB controllers on Armada 370/XP boards
  ...

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

6a2af59c4e9940ca67b80bb4905c8b3741f66d2d