Merge tag 'renesas-dt2-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Fri, 29 May 2015 11:59:55 +0000 (13:59 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 29 May 2015 11:59:55 +0000 (13:59 +0200)
commitff28ea63425d13e4d889bc644dcc76c6f3418a38
tree81cba1c7c0944c4acc52c33d5157dd971189f999
parent047d378a0075cc1559614270a1c9a5ce56b2a882
parentacea43fcb02746e907725c6dbd2eb95b32d79ea5
Merge tag 'renesas-dt2-for-v4.2' of git://git./linux/kernel/git/horms/renesas into next/dt

Merge "Second Round of Renesas ARM Based SoC DT Updates for v4.2" from Simon Horman:

* Describe DMA for the serial ports of R-Car Gen2 SoCs
* Add MMCIF max-frequency to R-Car Gen2 SoCs
* Use "nor-jedec" instead of "jedec,spi-nor"

* tag 'renesas-dt2-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7790 dtsi: Describe DMA for the serial ports
  ARM: shmobile: r8a7791 dtsi: Describe DMA for the serial ports
  ARM: shmobile: r8a7794 dtsi: Describe DMA for the serial ports
  ARM: shmobile: r8a7791: add MMCIF max-frequency
  ARM: shmobile: r8a7790: add MMCIF max-frequency
  ARM: shmobile: bockw dts: Replace "nor-jedec" by "jedec,spi-nor"
  ARM: shmobile: henninger dts: Replace "nor-jedec" by "jedec,spi-nor"
  ARM: shmobile: bockw-reference dts: Replace "nor-jedec" by "jedec,spi-nor"
  ARM: shmobile: koelsch dts: Replace "nor-jedec" by "jedec,spi-nor"
  ARM: shmobile: lager dts: Replace "nor-jedec" by "jedec,spi-nor"
arch/arm/boot/dts/r8a7791-koelsch.dts