ARM: dts: uniphier: sync DT with Linux 4.14-rc5

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/dts/uniphier-ld11.dtsi b/arch/arm/dts/uniphier-ld11.dtsi
index 0cc6fd716e5763455422af6f2527910193af853d..cf079b9cd4cf61d018e671636c4d8e876847161d 100644 (file)
--- a/arch/arm/dts/uniphier-ld11.dtsi
+++ b/arch/arm/dts/uniphier-ld11.dtsi
@@ -175,6 +175,19 @@
                                                  "gpio_range4",
                                                  "gpio_range5";
                        ngpios = <200>;
+                       socionext,interrupt-ranges = <0 48 16>, <16 154 5>,
+                                                    <21 217 3>;
+               };
+
+               adamv@57920000 {
+                       compatible = "socionext,uniphier-ld11-adamv",
+                                    "simple-mfd", "syscon";
+                       reg = <0x57920000 0x1000>;
+
+                       adamv_rst: reset {
+                               compatible = "socionext,uniphier-ld11-adamv-reset";
+                               #reset-cells = <1>;
+                       };
                };
 
                i2c0: i2c@58780000 {

diff --git a/arch/arm/dts/uniphier-ld20.dtsi b/arch/arm/dts/uniphier-ld20.dtsi
index a7fdaa74d1553fa349ca058f31342bcae6f1e5b9..68f0292ec7354d08135c0a68810780e195f34b33 100644 (file)
--- a/arch/arm/dts/uniphier-ld20.dtsi
+++ b/arch/arm/dts/uniphier-ld20.dtsi
@@ -223,6 +223,36 @@
                        clock-frequency = <58820000>;
                };
 
+               gpio: gpio@55000000 {
+                       compatible = "socionext,uniphier-gpio";
+                       reg = <0x55000000 0x200>;
+                       interrupt-parent = <&aidet>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio-ranges = <&pinctrl 0 0 0>,
+                                     <&pinctrl 96 0 0>,
+                                     <&pinctrl 160 0 0>;
+                       gpio-ranges-group-names = "gpio_range0",
+                                                 "gpio_range1",
+                                                 "gpio_range2";
+                       ngpios = <205>;
+                       socionext,interrupt-ranges = <0 48 16>, <16 154 5>,
+                                                    <21 217 3>;
+               };
+
+               adamv@57920000 {
+                       compatible = "socionext,uniphier-ld20-adamv",
+                                    "simple-mfd", "syscon";
+                       reg = <0x57920000 0x1000>;
+
+                       adamv_rst: reset {
+                               compatible = "socionext,uniphier-ld20-adamv-reset";
+                               #reset-cells = <1>;
+                       };
+               };
+
                i2c0: i2c@58780000 {
                        compatible = "socionext,uniphier-fi2c";
                        status = "disabled";

diff --git a/arch/arm/dts/uniphier-ld4-ref.dts b/arch/arm/dts/uniphier-ld4-ref.dts
index 0fd66e7b2316b818c01f2702fc1e3a5e82c01b43..fb94df42d7245a86fb667482579aa731115d2374 100644 (file)
--- a/arch/arm/dts/uniphier-ld4-ref.dts
+++ b/arch/arm/dts/uniphier-ld4-ref.dts
@@ -68,3 +68,7 @@
 &usb1 {
        status = "okay";
 };
+
+&nand {
+       status = "okay";
+};

diff --git a/arch/arm/dts/uniphier-ld6b-ref.dts b/arch/arm/dts/uniphier-ld6b-ref.dts
index 926d37ee73ca5b1b0ad5821ab42568063aa2e638..9b136b8603df11553756ef47f9bac87f79aaf0a6 100644 (file)
--- a/arch/arm/dts/uniphier-ld6b-ref.dts
+++ b/arch/arm/dts/uniphier-ld6b-ref.dts
@@ -70,3 +70,7 @@
 &usb1 {
        status = "okay";
 };
+
+&nand {
+       status = "okay";
+};

diff --git a/arch/arm/dts/uniphier-pinctrl.dtsi b/arch/arm/dts/uniphier-pinctrl.dtsi
index d5e8aafccbd63df13f2339cc4bc0059cf782d7a4..a1b9a6c76246ea024e256a65c964067aff05138e 100644 (file)
--- a/arch/arm/dts/uniphier-pinctrl.dtsi
+++ b/arch/arm/dts/uniphier-pinctrl.dtsi
@@ -23,6 +23,21 @@
                function = "emmc";
        };
 
+       pinctrl_ether_mii: ether_mii_grp {
+               groups = "ether_mii";
+               function = "ether_mii";
+       };
+
+       pinctrl_ether_rgmii: ether_rgmii_grp {
+               groups = "ether_rgmii";
+               function = "ether_rgmii";
+       };
+
+       pinctrl_ether_rmii: ether_rmii_grp {
+               groups = "ether_rmii";
+               function = "ether_rmii";
+       };
+
        pinctrl_i2c0: i2c0_grp {
                groups = "i2c0";
                function = "i2c0";

diff --git a/arch/arm/dts/uniphier-pxs3-ref.dts b/arch/arm/dts/uniphier-pxs3-ref.dts
index 1118dd7c6ea56efea610b2a4ba031e909f1d71e0..27de84dabff01e3cac47178409c16ce491b829a3 100644 (file)
--- a/arch/arm/dts/uniphier-pxs3-ref.dts
+++ b/arch/arm/dts/uniphier-pxs3-ref.dts
@@ -68,3 +68,7 @@
 &usb1 {
        status = "okay";
 };
+
+&nand {
+       status = "okay";
+};

diff --git a/arch/arm/dts/uniphier-sld8-ref.dts b/arch/arm/dts/uniphier-sld8-ref.dts
index 478ee0a6310be9913d66cc31650f9467ed2cc499..c94f0af65a45933a9be75de6793f7965308cc80d 100644 (file)
--- a/arch/arm/dts/uniphier-sld8-ref.dts
+++ b/arch/arm/dts/uniphier-sld8-ref.dts
@@ -72,3 +72,7 @@
 &usb2 {
        status = "okay";
 };
+
+&nand {
+       status = "okay";
+};