projects / platform / adaptation / renesas_rcar / renesas_kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aabdd29 a6268b8)
Merge tag 'at91-soc' of git://github.com/at91linux/linux-at91 into late/cleanup
authorArnd Bergmann <arnd@arndb.de>
Mon, 29 Apr 2013 15:26:36 +0000 (17:26 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 29 Apr 2013 15:28:37 +0000 (17:28 +0200)
From Nicolas Ferre <nicolas.ferre@atmel.com>:

DT modifications for generic slave DMA binding.
Addition of MCI and I2C DMA bindings.
A little DT machine compatibility removal for SAMA5.

* tag 'at91-soc' of git://github.com/at91linux/linux-at91:
  ARM: at91/sama5d34ek.dts: remove not needed compatibility string
  ARM: at91: dts: add MCI DMA support
  ARM: at91: dts: add i2c dma support
  ARM: at91: dts: set #dma-cells to the correct value

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
arch/arm/boot/dts/at91sam9x5.dtsi patch | diff1 | diff2 | blob | history

diff --cc arch/arm/boot/dts/at91sam9x5.dtsi
Simple merge
Domain: System / Uncategorized;