Merge git://git.denx.de/u-boot-video

[oweals/u-boot.git] / arch / arm / dts / uniphier-ld4.dtsi

diff --git a/arch/arm/dts/uniphier-ld4.dtsi b/arch/arm/dts/uniphier-ld4.dtsi
index bbfa164c92a3dcccb2d9026bcf5216512394f2a8..a3bcf227f4388707109a61f127fbb1c85d117219 100644 (file)
--- a/arch/arm/dts/uniphier-ld4.dtsi
+++ b/arch/arm/dts/uniphier-ld4.dtsi
@@ -4,13 +4,13 @@
  * Copyright (C) 2015-2016 Socionext Inc.
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+        X11
+ * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
-/include/ "skeleton.dtsi"
-
 / {
        compatible = "socionext,uniphier-ld4";
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        cpus {
                #address-cells = <1>;
@@ -282,7 +282,7 @@
                        pinctrl-0 = <&pinctrl_system_bus>;
                };
 
-               smpctrl@59800000 {
+               smpctrl@59801000 {
                        compatible = "socionext,uniphier-smpctrl";
                        reg = <0x59801000 0x400>;
                };
@@ -424,9 +424,11 @@
                        interrupt-controller;
                };
 
-               aidet@61830000 {
-                       compatible = "simple-mfd", "syscon";
+               aidet: aidet@61830000 {
+                       compatible = "socionext,uniphier-ld4-aidet";
                        reg = <0x61830000 0x200>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
                };
 
                sysctrl@61840000 {
@@ -446,17 +448,16 @@
                };
 
                nand: nand@68000000 {
-                       compatible = "socionext,denali-nand-v5a";
+                       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_nand>;
+                       pinctrl-0 = <&pinctrl_nand2cs>;
                        clocks = <&sys_clk 2>;
-                       nand-ecc-strength = <8>;
                };
        };
 };
 
-/include/ "uniphier-pinctrl.dtsi"
+#include "uniphier-pinctrl.dtsi"