Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt
authorArnd Bergmann <arnd@arndb.de>
Wed, 26 Jun 2013 14:55:36 +0000 (16:55 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 26 Jun 2013 14:56:24 +0000 (16:56 +0200)
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  2 
arch/arm/boot/dts/at91rm9200.dtsi
arch/arm/boot/dts/at91sam9n12.dtsi
arch/arm/boot/dts/sama5d3.dtsi

Simple merge
Simple merge
                        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";
                        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";