sunxi: make patches apply cleanly on 5.4

[openwrt/staging/ynezz.git] / target / linux / sunxi / patches-5.4 / 310-Revert-ARM-dts-sun7i-Add-BCM53125-switch-nodes-to-th.patch

diff --git a/target/linux/sunxi/patches-5.4/310-Revert-ARM-dts-sun7i-Add-BCM53125-switch-nodes-to-th.patch b/target/linux/sunxi/patches-5.4/310-Revert-ARM-dts-sun7i-Add-BCM53125-switch-nodes-to-th.patch
index 1d58b7bcba2249f5695075e795d4b2aff54f1a78..79c1671de13b9c146bc12d4264243a6bb87b4144 100644 (file)
--- a/target/linux/sunxi/patches-5.4/310-Revert-ARM-dts-sun7i-Add-BCM53125-switch-nodes-to-th.patch
+++ b/target/linux/sunxi/patches-5.4/310-Revert-ARM-dts-sun7i-Add-BCM53125-switch-nodes-to-th.patch
@@ -15,10 +15,10 @@ This reverts commit d7b9eaff5f0ca00726336b4c0c3c29decf30412a.
 
 --- a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
 +++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
-@@ -124,67 +124,13 @@
+@@ -120,65 +120,13 @@
  &gmac {
        pinctrl-names = "default";
-       pinctrl-0 = <&gmac_pins_rgmii_a>;
+       pinctrl-0 = <&gmac_rgmii_pins>;
 +      phy = <&phy1>;
        phy-mode = "rgmii";
        phy-supply = <&reg_gmac_3v3>;
@@ -37,8 +37,6 @@ This reverts commit d7b9eaff5f0ca00726336b4c0c3c29decf30412a.
 -              switch: ethernet-switch@1e {
 -                      compatible = "brcm,bcm53125";
 -                      reg = <30>;
--                      #address-cells = <1>;
--                      #size-cells = <0>;
 -
 -                      ports {
 -                              #address-cells = <1>;