Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / arch / arm / boot / dts / sama5d4.dtsi

diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
index 2a31d66164acef3b1fd18dacacaec680dddab954..d986b41b965495bce29dc0d610a715ff4ffc0208 100644 (file)
--- a/arch/arm/boot/dts/sama5d4.dtsi
+++ b/arch/arm/boot/dts/sama5d4.dtsi
@@ -62,6 +62,7 @@
                gpio0 = &pioA;
                gpio1 = &pioB;
                gpio2 = &pioC;
+               gpio3 = &pioD;
                gpio4 = &pioE;
                tcb0 = &tcb0;
                tcb1 = &tcb1;
@@ -272,7 +273,7 @@
                };
 
                nand0: nand@80000000 {
-                       compatible = "atmel,at91rm9200-nand";
+                       compatible = "atmel,sama5d4-nand", "atmel,at91rm9200-nand";
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges;
@@ -1121,6 +1122,18 @@
                                        clocks = <&pioC_clk>;
                                };
 
+                               pioD: gpio@fc068000 {
+                                       compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
+                                       reg = <0xfc068000 0x100>;
+                                       interrupts = <5 IRQ_TYPE_LEVEL_HIGH 1>;
+                                       #gpio-cells = <2>;
+                                       gpio-controller;
+                                       interrupt-controller;
+                                       #interrupt-cells = <2>;
+                                       clocks = <&pioD_clk>;
+                                       status = "disabled";
+                               };
+
                                pioE: gpio@fc06d000 {
                                        compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
                                        reg = <0xfc06d000 0x100>;