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 <[email protected]>

diff --combined arch/arm/boot/dts/at91rm9200.dtsi
index 34c03806fe061b2828f7398b5b67ade8b3d5c0f2,1fc645ef46ae5c7cf1e17c978f720c848aaa3da9..92b9e21389db6c7d800cf97ecabf39133819f88c
--- 1/arch/arm/boot/dts/at91rm9200.dtsi
--- 2/arch/arm/boot/dts/at91rm9200.dtsi
+++ b/arch/arm/boot/dts/at91rm9200.dtsi
@@@ -38,12 -38,8 +38,12 @@@
                ssc2 = &ssc2;
        };
        cpus {
 -              cpu@0 {
 +              #address-cells = <0>;
 +              #size-cells = <0>;
 +
 +              cpu {
                        compatible = "arm,arm920t";
 +                      device_type = "cpu";
                };
        };
  
@@@ -478,6 -474,15 +478,15 @@@
                                        };
                                };
  
+                               spi0 {
+                                       pinctrl_spi0: spi0-0 {
+                                               atmel,pins =
+                                                       <AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PA0 periph A SPI0_MISO pin */
+                                                        AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PA1 periph A SPI0_MOSI pin */
+                                                        AT91_PIOA 2 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PA2 periph A SPI0_SPCK pin */
+                                       };
+                               };
+ 
                                pioA: gpio@fffff400 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffff400 0x200>;
@@@ -578,6 -583,17 +587,17 @@@
                                interrupts = <11 IRQ_TYPE_LEVEL_HIGH 2>;
                                status = "disabled";
                        };
+ 
+                       spi0: spi@fffe0000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               compatible = "atmel,at91rm9200-spi";
+                               reg = <0xfffe0000 0x200>;
+                               interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&pinctrl_spi0>;
+                               status = "disabled";
+                       };
                };
  
                nand0: nand@40000000 {

diff --combined arch/arm/boot/dts/at91sam9n12.dtsi
index 973bf5fd98007797e210e568f7c5907fc79bf0fe,a42dc1f6c56a7638e3e2d3ca732b4fc95fc43c1f..bb7f564b3a557fda71f0f9289e1fd7b7225ee73d
--- 1/arch/arm/boot/dts/at91sam9n12.dtsi
--- 2/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@@ -35,12 -35,8 +35,12 @@@
                ssc0 = &ssc0;
        };
        cpus {
 -              cpu@0 {
 -                      compatible = "arm,arm926ejs";
 +              #address-cells = <0>;
 +              #size-cells = <0>;
 +
 +              cpu {
 +                      compatible = "arm,arm926ej-s";
 +                      device_type = "cpu";
                };
        };
  
@@@ -65,7 -61,6 +65,7 @@@
                                compatible = "atmel,at91rm9200-aic";
                                interrupt-controller;
                                reg = <0xfffff000 0x200>;
 +                              atmel,external-irqs = <31>;
                        };
  
                        ramc0: ramc@ffffe800 {
@@@ -492,6 -487,9 +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 -501,9 +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";

diff --combined arch/arm/boot/dts/sama5d3.dtsi
index bbf88d72295638544a983a5239741b1fa520359b,5956f9be3e8ff026d5af8b4229455141926bda2b..a1d5e25a66986492e3d44f5348102c64a6b3658a
--- 1/arch/arm/boot/dts/sama5d3.dtsi
--- 2/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@@ -39,12 -39,8 +39,12 @@@
                ssc1 = &ssc1;
        };
        cpus {
 +              #address-cells = <1>;
 +              #size-cells = <0>;
                cpu@0 {
 +                      device_type = "cpu";
                        compatible = "arm,cortex-a5";
 +                      reg = <0x0>;
                };
        };
  
@@@ -80,9 -76,17 +80,12 @@@
                        spi0: spi@f0004000 {
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               compatible = "atmel,at91sam9x5-spi";
+                               compatible = "atmel,at91rm9200-spi";
                                reg = <0xf0004000 0x100>;
                                interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;
 -                              cs-gpios = <&pioD 13 0
 -                                          &pioD 14 0 /* conflicts with SCK0 and CANRX0 */
 -                                          &pioD 15 0 /* conflicts with CTS0 and CANTX0 */
 -                                          &pioD 16 0 /* conflicts with RTS0 and PWMFI3 */
 -                                         >;
+                               dmas = <&dma0 2 AT91_DMA_CFG_PER_ID(1)>,
+                                      <&dma0 2 AT91_DMA_CFG_PER_ID(2)>;
+                               dma-names = "tx", "rx";
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_spi0>;
                                status = "disabled";
@@@ -159,7 -163,7 +162,7 @@@
                        };
  
                        macb0: ethernet@f0028000 {
 -                              compatible = "cnds,pc302-gem", "cdns,gem";
 +                              compatible = "cdns,pc302-gem", "cdns,gem";
                                reg = <0xf0028000 0x100>;
                                interrupts = <34 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
@@@ -203,9 -207,17 +206,12 @@@
                        spi1: spi@f8008000 {
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               compatible = "atmel,at91sam9x5-spi";
+                               compatible = "atmel,at91rm9200-spi";
                                reg = <0xf8008000 0x100>;
                                interrupts = <25 IRQ_TYPE_LEVEL_HIGH 3>;
 -                              cs-gpios = <&pioC 25 0
 -                                          &pioC 26 0 /* conflitcs with TWD1 and ISI_D11 */
 -                                          &pioC 27 0 /* conflitcs with TWCK1 and ISI_D10 */
 -                                          &pioC 28 0 /* conflitcs with PWMFI0 and ISI_D9 */
 -                                         >;
+                               dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(15)>,
+                                      <&dma1 2 AT91_DMA_CFG_PER_ID(16)>;
+                               dma-names = "tx", "rx";
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_spi1>;
                                status = "disabled";