Merge tag 'uniphier-dt-v4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

UniPhier ARM SoC DT updates for v4.14 (2nd)

- add AIDET irqchip device nodes
- fix size of sdctrl node
- add ethernet pinmux nodes

* tag 'uniphier-dt-v4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  ARM: dts: uniphier: add pinctrl groups of ethernet phy mode
  ARM: dts: uniphier: fix size of sdctrl nodes
  ARM: dts: uniphier: add AIDET nodes

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/boot/dts/uniphier-ld4.dtsi b/arch/arm/boot/dts/uniphier-ld4.dtsi
index 91410609b1819f67532d3a1746b43b67935107bf..79183db5b386895781b21635407bce3fa7efb8ac 100644 (file)
--- a/arch/arm/boot/dts/uniphier-ld4.dtsi
+++ b/arch/arm/boot/dts/uniphier-ld4.dtsi
@@ -270,6 +270,13 @@ intc: interrupt-controller@60001000 {
                        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";

diff --git a/arch/arm/boot/dts/uniphier-pinctrl.dtsi b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
index 425b8f1e1ae5c3f0c4ef9e4bc46babad43b924c9..be82cddc407245b82cfde6b02cbcc970576e6e0d 100644 (file)
--- a/arch/arm/boot/dts/uniphier-pinctrl.dtsi
+++ b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
@@ -18,6 +18,21 @@ pinctrl_emmc: emmc_grp {
                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/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi
index 0c43d7836015a3f2e0a2e65bcebd52e9f0b76212..b3dbbd9b6e3955f3330cb3cb4bb5d71c617f4f9a 100644 (file)
--- a/arch/arm/boot/dts/uniphier-pro4.dtsi
+++ b/arch/arm/boot/dts/uniphier-pro4.dtsi
@@ -268,6 +268,13 @@ pinctrl: pinctrl {
                        };
                };
 
+               aidet: aidet@5fc20000 {
+                       compatible = "socionext,uniphier-pro4-aidet";
+                       reg = <0x5fc20000 0x200>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+
                timer@60000200 {
                        compatible = "arm,cortex-a9-global-timer";
                        reg = <0x60000200 0x20>;

diff --git a/arch/arm/boot/dts/uniphier-pro5.dtsi b/arch/arm/boot/dts/uniphier-pro5.dtsi
index 36b64e53ed2ece4a4faaba36a9dfb2aebb3cfe56..b026bcd42a069351b1786959be0af090eaef21d3 100644 (file)
--- a/arch/arm/boot/dts/uniphier-pro5.dtsi
+++ b/arch/arm/boot/dts/uniphier-pro5.dtsi
@@ -292,7 +292,7 @@ smpctrl@59801000 {
                sdctrl@59810000 {
                        compatible = "socionext,uniphier-pro5-sdctrl",
                                     "simple-mfd", "syscon";
-                       reg = <0x59810000 0x800>;
+                       reg = <0x59810000 0x400>;
 
                        sd_clk: clock {
                                compatible = "socionext,uniphier-pro5-sd-clock";
@@ -331,6 +331,13 @@ pinctrl: pinctrl {
                        };
                };
 
+               aidet: aidet@5fc20000 {
+                       compatible = "socionext,uniphier-pro5-aidet";
+                       reg = <0x5fc20000 0x200>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+
                timer@60000200 {
                        compatible = "arm,cortex-a9-global-timer";
                        reg = <0x60000200 0x20>;

diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
index ed2b9a4516aa901a6bfb56824e4c36115ba577f4..90b020c950837d5d0c9d2a43d74d4a2c208b7463 100644 (file)
--- a/arch/arm/boot/dts/uniphier-pxs2.dtsi
+++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
@@ -276,7 +276,7 @@ smpctrl@59801000 {
                sdctrl@59810000 {
                        compatible = "socionext,uniphier-pxs2-sdctrl",
                                     "simple-mfd", "syscon";
-                       reg = <0x59810000 0x800>;
+                       reg = <0x59810000 0x400>;
 
                        sd_clk: clock {
                                compatible = "socionext,uniphier-pxs2-sd-clock";
@@ -315,6 +315,13 @@ pinctrl: pinctrl {
                        };
                };
 
+               aidet: aidet@5fc20000 {
+                       compatible = "socionext,uniphier-pxs2-aidet";
+                       reg = <0x5fc20000 0x200>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+
                timer@60000200 {
                        compatible = "arm,cortex-a9-global-timer";
                        reg = <0x60000200 0x20>;

diff --git a/arch/arm/boot/dts/uniphier-sld8.dtsi b/arch/arm/boot/dts/uniphier-sld8.dtsi
index 5b0b2f8225193e65202cc169eea7285bec5d9cb8..b0839033297169272ed3688cb352385920a41ea1 100644 (file)
--- a/arch/arm/boot/dts/uniphier-sld8.dtsi
+++ b/arch/arm/boot/dts/uniphier-sld8.dtsi
@@ -270,6 +270,13 @@ intc: interrupt-controller@60001000 {
                        interrupt-controller;
                };
 
+               aidet: aidet@61830000 {
+                       compatible = "socionext,uniphier-sld8-aidet";
+                       reg = <0x61830000 0x200>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+
                sysctrl@61840000 {
                        compatible = "socionext,uniphier-sld8-sysctrl",
                                     "simple-mfd", "syscon";