Merge tag 'uniphier-dt-v4.17-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt

Pull "UniPhier ARM SoC DT updates for v4.17 (2nd)" from Masahiro Yamada:

- add syscon property to sound nodes
- add more ethernet pin groups
- add ethernet support for PXs3 SoC

* tag 'uniphier-dt-v4.17-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  arm64: dts: uniphier: add ethernet node for PXs3
  ARM: dts: uniphier: add pinctrl groups of ethernet for second instance
  ARM: dts: uniphier: add syscon property for UniPhier sound system
  arm64: dts: uniphier: add syscon property for UniPhier sound system

6 files changed, 74 insertions, 3 deletions

diff --git a/arch/arm/boot/dts/uniphier-pinctrl.dtsi b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
index 9847af85b542..51f0e69f49fd 100644
--- a/arch/arm/boot/dts/uniphier-pinctrl.dtsi
+++ b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
@@ -71,6 +71,16 @@
                 function = "ether_rmii";
         };
 
+        pinctrl_ether1_rgmii: ether1-rgmii {
+                groups = "ether1_rgmii";
+                function = "ether1_rgmii";
+        };
+
+        pinctrl_ether1_rmii: ether1-rmii {
+                groups = "ether1_rmii";
+                function = "ether1_rmii";
+        };
+
         pinctrl_i2c0: i2c0 {
                 groups = "i2c0";
                 function = "i2c0";
diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
index 595045441c9c..debcbd15c24b 100644
--- a/arch/arm/boot/dts/uniphier-pxs2.dtsi
+++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
@@ -242,6 +242,7 @@
                         reset-names = "aio";
                         resets = <&sys_rst 40>;
                         #sound-dai-cells = <1>;
+                        socionext,syscon = <&soc_glue>;
 
                         i2s_port0: port@0 {
                                 i2s_hdmi: endpoint {
@@ -418,7 +419,7 @@
                         };
                 };
 
-                soc-glue@5f800000 {
+                soc_glue: soc-glue@5f800000 {
                         compatible = "socionext,uniphier-pxs2-soc-glue",
                                      "simple-mfd", "syscon";
                         reg = <0x5f800000 0x2000>;
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
index efa95573b2aa..e62bda1cf2d9 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
@@ -197,6 +197,7 @@
                         reset-names = "aio";
                         resets = <&sys_rst 40>;
                         #sound-dai-cells = <1>;
+                        socionext,syscon = <&soc_glue>;
 
                         i2s_port0: port@0 {
                                 i2s_hdmi: endpoint {
@@ -479,7 +480,7 @@
                         };
                 };
 
-                soc-glue@5f800000 {
+                soc_glue: soc-glue@5f800000 {
                         compatible = "socionext,uniphier-ld11-soc-glue",
                                      "simple-mfd", "syscon";
                         reg = <0x5f800000 0x2000>;
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
index 19c935688a77..9efe20d07589 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
@@ -297,6 +297,7 @@
                         reset-names = "aio";
                         resets = <&sys_rst 40>;
                         #sound-dai-cells = <1>;
+                        socionext,syscon = <&soc_glue>;
 
                         i2s_port0: port@0 {
                                 i2s_hdmi: endpoint {
@@ -525,7 +526,7 @@
                         cdns,phy-dll-delay-sdclk-hsmmc = <21>;
                 };
 
-                soc-glue@5f800000 {
+                soc_glue: soc-glue@5f800000 {
                         compatible = "socionext,uniphier-ld20-soc-glue",
                                      "simple-mfd", "syscon";
                         reg = <0x5f800000 0x2000>;
diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts
index e62d068776d5..c1bb607bd211 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts
+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts
@@ -75,6 +75,28 @@
         status = "okay";
 };
 
+&eth0 {
+        status = "okay";
+        phy-handle = <&ethphy0>;
+};
+
+&mdio0 {
+        ethphy0: ethphy@0 {
+                reg = <0>;
+        };
+};
+
+&eth1 {
+        status = "okay";
+        phy-handle = <&ethphy1>;
+};
+
+&mdio1 {
+        ethphy1: ethphy@0 {
+                reg = <0>;
+        };
+};
+
 &nand {
         status = "okay";
 };
diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
index b537a3c0071f..7c8f710d9bfa 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
@@ -405,6 +405,42 @@
                         };
                 };
 
+                eth0: ethernet@65000000 {
+                        compatible = "socionext,uniphier-pxs3-ave4";
+                        status = "disabled";
+                        reg = <0x65000000 0x8500>;
+                        interrupts = <0 66 4>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_ether_rgmii>;
+                        clocks = <&sys_clk 6>;
+                        resets = <&sys_rst 6>;
+                        phy-mode = "rgmii";
+                        local-mac-address = [00 00 00 00 00 00];
+
+                        mdio0: mdio {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
+                };
+
+                eth1: ethernet@65200000 {
+                        compatible = "socionext,uniphier-pxs3-ave4";
+                        status = "disabled";
+                        reg = <0x65200000 0x8500>;
+                        interrupts = <0 67 4>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_ether1_rgmii>;
+                        clocks = <&sys_clk 7>;
+                        resets = <&sys_rst 7>;
+                        phy-mode = "rgmii";
+                        local-mac-address = [00 00 00 00 00 00];
+
+                        mdio1: mdio {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
+                };
+
                 nand: nand@68000000 {
                         compatible = "socionext,uniphier-denali-nand-v5b";
                         status = "disabled";