3 files changed, 26 insertions, 25 deletions

diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
index f5e0f82fd503..58c4256d37a3 100644
--- a/Documentation/devicetree/bindings/arm/shmobile.txt
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -27,7 +27,7 @@ SoCs:
     compatible = "renesas,r8a77470"
   - RZ/G2M (R8A774A1)
     compatible = "renesas,r8a774a1"
-  - RZ/G2E (RA8774C0)
+  - RZ/G2E (R8A774C0)
     compatible = "renesas,r8a774c0"
   - R-Car M1A (R8A77781)
     compatible = "renesas,r8a7778"
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index b5f2273caca4..a79c8d369e0b 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -652,7 +652,7 @@
                         clock-names = "fck", "brg_int", "scif_clk";
                         dmas = <&dmac1 0x35>, <&dmac1 0x34>,
                                <&dmac2 0x35>, <&dmac2 0x34>;
-                        dma-names = "tx", "rx";
+                        dma-names = "tx", "rx", "tx", "rx";
                         power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
                         resets = <&cpg 518>;
                         status = "disabled";
diff --git a/arch/arm64/boot/dts/renesas/r8a77980-condor.dts b/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
index fe2e2c051cc9..5a7012be0d6a 100644
--- a/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
@@ -15,7 +15,7 @@
 
         aliases {
                 serial0 = &scif0;
-                ethernet0 = &avb;
+                ethernet0 = &gether;
         };
 
         chosen {
@@ -97,23 +97,6 @@
         };
 };
 
-&avb {
-        pinctrl-0 = <&avb_pins>;
-        pinctrl-names = "default";
-
-        phy-mode = "rgmii-id";
-        phy-handle = <&phy0>;
-        renesas,no-ether-link;
-        status = "okay";
-
-        phy0: ethernet-phy@0 {
-                rxc-skew-ps = <1500>;
-                reg = <0>;
-                interrupt-parent = <&gpio1>;
-                interrupts = <17 IRQ_TYPE_LEVEL_LOW>;
-        };
-};
-
 &canfd {
         pinctrl-0 = <&canfd0_pins>;
         pinctrl-names = "default";
@@ -139,6 +122,23 @@
         clock-frequency = <32768>;
 };
 
+&gether {
+        pinctrl-0 = <&gether_pins>;
+        pinctrl-names = "default";
+
+        phy-mode = "rgmii-id";
+        phy-handle = <&phy0>;
+        renesas,no-ether-link;
+        status = "okay";
+
+        phy0: ethernet-phy@0 {
+                rxc-skew-ps = <1500>;
+                reg = <0>;
+                interrupt-parent = <&gpio4>;
+                interrupts = <23 IRQ_TYPE_LEVEL_LOW>;
+        };
+};
+
 &i2c0 {
         pinctrl-0 = <&i2c0_pins>;
         pinctrl-names = "default";
@@ -236,16 +236,17 @@
 };
 
 &pfc {
-        avb_pins: avb {
-                groups = "avb_mdio", "avb_rgmii";
-                function = "avb";
-        };
-
         canfd0_pins: canfd0 {
                 groups = "canfd0_data_a";
                 function = "canfd0";
         };
 
+        gether_pins: gether {
+                groups = "gether_mdio_a", "gether_rgmii",
+                         "gether_txcrefclk", "gether_txcrefclk_mega";
+                function = "gether";
+        };
+
         i2c0_pins: i2c0 {
                 groups = "i2c0";
                 function = "i2c0";