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

From Nicolas Ferre:
First DT pull-request for 3.14
- many little corrections and documentation updates
- LCD FB Device Tree for at91sam9263 and at91sam9g45 boards
- crypto peripherals DT entries + DMA specification
- new Cosino board

* tag 'at91-dt' of git://github.com/at91linux/linux-at91: (21 commits)
  ARM: at91/at91rm9200ek.dts: rearrange nodes in address ascending order
  ARM: at91: dt: at91rm9200ek: add emac and nor flash support
  ARM: at91: add uart aliases to sama5d3 dtsi
  ARM: at91: add i2c2 pinctrl speficifation to sama5d3 DT
  ARM: at91: Animeo IP: fix mtd partition table
  ARM: at91: at91sam9g45: add i2c pinctrl
  ARM: at91: at91sam9g45: set default mmc pinctrl-names
  ARM: at91: sama5d3: enable qt1070 as a wakeup source
  ARM: at91: add support for Cosino board series by HCE Engineering
  ARM: at91/dt/sama5d3: add DMA information to SHA/AES/TDES nodes
  ARM: at91/dt/trivial: before sama5d3, Atmel MPU were using at91 prefix
  ARM: at91/dt/trivial: use macro for AES irq type
  ARM: at91: sam9263ek: add dt lcd support
  ARM: at91: at9sam9m10g45ek: add dt lcd support
  ARM: at91: sam9263: add fb dt support
  ARM: at91: sam9g45: add fb dt support
  ARM: at91/dt: binding: add missing compatibility string in SDRAM/DDR documentation
  ARM: at91/dt: binding: add precision to AIC documentation
  ARM: at91/dt: add atmel,pullup-gpio to at91rm9200ek usb1 definition
  ARM: at91/dt: add ethernet phy to at91rm9200ek board
  ...

Signed-off-by: Kevin Hilman <khilman@linaro.org>

diff --combined arch/arm/boot/dts/Makefile
index 7154de6,772a30e..5fb27d3
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -30,6 -30,7 +30,7 @@@ dtb-$(CONFIG_ARCH_AT91) += pm9g45.dt
  dtb-$(CONFIG_ARCH_AT91) += at91sam9n12ek.dtb
  # sam9x5
  dtb-$(CONFIG_ARCH_AT91) += at91-ariag25.dtb
+ dtb-$(CONFIG_ARCH_AT91) += at91-cosino_mega2560.dtb
  dtb-$(CONFIG_ARCH_AT91) += at91sam9g15ek.dtb
  dtb-$(CONFIG_ARCH_AT91) += at91sam9g25ek.dtb
  dtb-$(CONFIG_ARCH_AT91) += at91sam9g35ek.dtb
@@@ -40,8 -41,6 +41,8 @@@ dtb-$(CONFIG_ARCH_AT91)       += sama5d31ek.d
  dtb-$(CONFIG_ARCH_AT91)       += sama5d33ek.dtb
  dtb-$(CONFIG_ARCH_AT91)       += sama5d34ek.dtb
  dtb-$(CONFIG_ARCH_AT91)       += sama5d35ek.dtb
 +dtb-$(CONFIG_ARCH_AT91)       += sama5d36ek.dtb
 +
  dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
  dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm11351-brt.dtb \
@@@ -92,7 -91,6 +93,7 @@@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood
        kirkwood-mplcec4.dtb \
        kirkwood-mv88f6281gtw-ge.dtb \
        kirkwood-netgear_readynas_duo_v2.dtb \
 +      kirkwood-netgear_readynas_nv+_v2.dtb \
        kirkwood-ns2.dtb \
        kirkwood-ns2lite.dtb \
        kirkwood-ns2max.dtb \
@@@ -117,7 -115,6 +118,7 @@@ dtb-$(CONFIG_ARCH_MVEBU) += armada-370-
        armada-xp-axpwifiap.dtb \
        armada-xp-db.dtb \
        armada-xp-gp.dtb \
 +      armada-xp-netgear-rn2120.dtb \
        armada-xp-matrix.dtb \
        armada-xp-openblocks-ax3-4.dtb
  dtb-$(CONFIG_ARCH_MXC) += \

diff --combined arch/arm/boot/dts/sama5d3.dtsi
index 0b0aade,070c5c3..fad42f5
--- 1/arch/arm/boot/dts/sama5d3.dtsi
--- 2/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@@ -1,6 -1,6 +1,6 @@@
  /*
   * sama5d3.dtsi - Device Tree Include file for SAMA5D3 family SoC
 - *                applies to SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35 SoC
 + *                applies to SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35, SAMA5D36 SoC
   *
   *  Copyright (C) 2013 Atmel,
   *                2013 Ludovic Desroches <ludovic.desroches@atmel.com>
@@@ -304,6 -304,8 +304,8 @@@
                                dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(11)>,
                                       <&dma1 2 AT91_DMA_CFG_PER_ID(12)>;
                                dma-names = "tx", "rx";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&pinctrl_i2c2>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                clocks = <&twi2_clk>;
@@@ -333,21 -335,29 +335,29 @@@
                        };
  
                        sha@f8034000 {
-                               compatible = "atmel,sam9g46-sha";
+                               compatible = "atmel,at91sam9g46-sha";
                                reg = <0xf8034000 0x100>;
                                interrupts = <42 IRQ_TYPE_LEVEL_HIGH 0>;
+                               dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(17)>;
+                               dma-names = "tx";
                        };
  
                        aes@f8038000 {
-                               compatible = "atmel,sam9g46-aes";
+                               compatible = "atmel,at91sam9g46-aes";
                                reg = <0xf8038000 0x100>;
-                               interrupts = <43 4 0>;
+                               interrupts = <43 IRQ_TYPE_LEVEL_HIGH 0>;
+                               dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(18)>,
+                                      <&dma1 2 AT91_DMA_CFG_PER_ID(19)>;
+                               dma-names = "tx", "rx";
                        };
  
                        tdes@f803c000 {
-                               compatible = "atmel,sam9g46-tdes";
+                               compatible = "atmel,at91sam9g46-tdes";
                                reg = <0xf803c000 0x100>;
                                interrupts = <44 IRQ_TYPE_LEVEL_HIGH 0>;
+                               dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(20)>,
+                                      <&dma1 2 AT91_DMA_CFG_PER_ID(21)>;
+                               dma-names = "tx", "rx";
                        };
  
                        dma0: dma-controller@ffffe600 {
@@@ -486,6 -496,14 +496,14 @@@
                                        };
                                };
  
+                               i2c2 {
+                                       pinctrl_i2c2: i2c2-0 {
+                                               atmel,pins =
+                                                       <AT91_PIOA 18 AT91_PERIPH_B AT91_PINCTRL_NONE   /* TWD2 pin, conflicts with LCDDAT18, ISI_D2 */
+                                                        AT91_PIOA 19 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* TWCK2 pin, conflicts with LCDDAT19, ISI_D3 */
+                                       };
+                               };
+ 
                                isi {
                                        pinctrl_isi: isi-0 {
                                                atmel,pins =