ARM: dts: rmobile: Extract AVB node extras on V3M Eagle

The AVB node is not complete in Linux 4.17 DTs on V3M Eagle, pull the
AVB node extras into U-Boot specific DT until they hit mainline Linux,
to make syncing of DTs easier.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
V2: Rebase on u-boot/master

diff --git a/arch/arm/dts/r8a77970-eagle-u-boot.dts b/arch/arm/dts/r8a77970-eagle-u-boot.dts
index 0c716deb6fcca9580430eee47fe13813d158f802..5b17f1d1f0bb3000be06ff27ae2038010873ee38 100644 (file)
--- a/arch/arm/dts/r8a77970-eagle-u-boot.dts
+++ b/arch/arm/dts/r8a77970-eagle-u-boot.dts
@@ -7,6 +7,7 @@
 
 #include "r8a77970-eagle.dts"
 #include "r8a77970-u-boot.dtsi"
+#include <dt-bindings/gpio/gpio.h>
 
 / {
        aliases {
@@ -14,6 +15,25 @@
        };
 };
 
+&avb {
+       pinctrl-0 = <&avb0_pins>;
+       pinctrl-names = "default";
+
+};
+
+&phy0 {
+       reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
+};
+
+&pfc {
+       avb0_pins: avb {
+               mux {
+                       groups = "avb0_link", "avb0_mdio", "avb0_rgmii", "avb0_txcrefclk";
+                       function = "avb0";
+               };
+       };
+};
+
 &rpc {
        num-cs = <1>;
        status = "okay";

diff --git a/arch/arm/dts/r8a77970-eagle.dts b/arch/arm/dts/r8a77970-eagle.dts
index 107ac5d393bb6ea5b6e94b6a9f16d384eaf38471..7fee1aa1ac701d0b3206e574faacfb86ff4fe201 100644 (file)
--- a/arch/arm/dts/r8a77970-eagle.dts
+++ b/arch/arm/dts/r8a77970-eagle.dts
@@ -8,7 +8,6 @@
 
 /dts-v1/;
 #include "r8a77970.dtsi"
-#include <dt-bindings/gpio/gpio.h>
 
 / {
        model = "Renesas Eagle board based on r8a77970";
@@ -32,8 +31,6 @@
 };
 
 &avb {
-       pinctrl-0 = <&avb0_pins>;
-       pinctrl-names = "default";
        renesas,no-ether-link;
        phy-handle = <&phy0>;
        phy-mode = "rgmii-id";
@@ -44,7 +41,6 @@
                reg = <0>;
                interrupt-parent = <&gpio1>;
                interrupts = <17 IRQ_TYPE_LEVEL_LOW>;
-               reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
        };
 };
 
@@ -72,13 +68,6 @@
 };
 
 &pfc {
-       avb0_pins: avb {
-               mux {
-                       groups = "avb0_link", "avb0_mdio", "avb0_rgmii", "avb0_txcrefclk";
-                       function = "avb0";
-               };
-       };
-
        i2c0_pins: i2c0 {
                groups = "i2c0";
                function = "i2c0";