Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt

From Nicolas Ferre:

- more SPI DT activation for rm9200
- SPI DMA for at91sam9n12/sama5d3
And one little fix for SPI compatibility string

* tag 'at91-dt' of git://github.com/at91linux/linux-at91:
  ARM: at91: dt: rm9200ek: add spi support
  ARM: at91: dt: rm9200: add spi support
  ARM: at91/DT: at91sam9n12: add SPI DMA client infos
  ARM: at91/DT: sama5d3: add SPI DMA client infos
  ARM: at91/DT: fix SPI compatibility string

Conflicts:
	arch/arm/boot/dts/sama5d3.dtsi

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

1 files changed, 6 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index 973bf5fd9800..bb7f564b3a55 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -492,6 +492,9 @@
                                 compatible = "atmel,at91rm9200-spi";
                                 reg = <0xf0000000 0x100>;
                                 interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>;
+                                dmas = <&dma 1 AT91_DMA_CFG_PER_ID(1)>,
+                                       <&dma 1 AT91_DMA_CFG_PER_ID(2)>;
+                                dma-names = "tx", "rx";
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_spi0>;
                                 status = "disabled";
@@ -503,6 +506,9 @@
                                 compatible = "atmel,at91rm9200-spi";
                                 reg = <0xf0004000 0x100>;
                                 interrupts = <14 IRQ_TYPE_LEVEL_HIGH 3>;
+                                dmas = <&dma 1 AT91_DMA_CFG_PER_ID(3)>,
+                                       <&dma 1 AT91_DMA_CFG_PER_ID(4)>;
+                                dma-names = "tx", "rx";
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_spi1>;
                                 status = "disabled";