Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / uniphier-ld4.dtsi

diff --git a/arch/arm/boot/dts/uniphier-ld4.dtsi b/arch/arm/boot/dts/uniphier-ld4.dtsi
index fb2fd9605b9de640c8caed33a0ecfeb7f7f57814..79183db5b386895781b21635407bce3fa7efb8ac 100644 (file)
--- a/arch/arm/boot/dts/uniphier-ld4.dtsi
+++ b/arch/arm/boot/dts/uniphier-ld4.dtsi
@@ -270,6 +270,13 @@
                        interrupt-controller;
                };
 
+               aidet: aidet@61830000 {
+                       compatible = "socionext,uniphier-ld4-aidet";
+                       reg = <0x61830000 0x200>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+
                sysctrl@61840000 {
                        compatible = "socionext,uniphier-ld4-sysctrl",
                                     "simple-mfd", "syscon";
@@ -285,7 +292,18 @@
                                #reset-cells = <1>;
                        };
                };
+
+               nand: nand@68000000 {
+                       compatible = "socionext,uniphier-denali-nand-v5a";
+                       status = "disabled";
+                       reg-names = "nand_data", "denali_reg";
+                       reg = <0x68000000 0x20>, <0x68100000 0x1000>;
+                       interrupts = <0 65 4>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_nand2cs>;
+                       clocks = <&sys_clk 2>;
+               };
        };
 };
 
-/include/ "uniphier-pinctrl.dtsi"
+#include "uniphier-pinctrl.dtsi"