From: Ioana Ciornei <ioana.ciornei@nxp.com>
Date: Thu, 22 Apr 2021 10:01:07 +0000 (+0300)
Subject: arm64: dts: ls1088a: remove downstream MDIO, PHY and DPMAC nodes
X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~205
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=308b248581ea986da15927eb4c4edae554b8c160;p=linux.git

arm64: dts: ls1088a: remove downstream MDIO, PHY and DPMAC nodes

All these nodes were integrated into upstream, removing their downstream
version so that we can cleanly apply the upstream patches.
This is a partial revert of the following commit:
d74e07cfadd4 ("arm64: dts: ls1088a: accumulated change to ls1088a boards")

Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts
index ba0d274d5a0f..2b4089e31320 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts
@@ -149,81 +149,3 @@
 	status = "okay";
 };
 
-&emdio1 {
-	/* Freescale F104 PHY1 */
-	mdio1_phy1: emdio1_phy@1 {
-		reg = <0x1c>;
-		phy-connection-type = "qsgmii";
-	};
-	mdio1_phy2: emdio1_phy@2 {
-		reg = <0x1d>;
-		phy-connection-type = "qsgmii";
-	};
-	mdio1_phy3: emdio1_phy@3 {
-		reg = <0x1e>;
-		phy-connection-type = "qsgmii";
-	};
-	mdio1_phy4: emdio1_phy@4 {
-		reg = <0x1f>;
-		phy-connection-type = "qsgmii";
-	};
-	/* F104 PHY2 */
-	mdio1_phy5: emdio1_phy@5 {
-		reg = <0x0c>;
-		phy-connection-type = "qsgmii";
-	};
-	mdio1_phy6: emdio1_phy@6 {
-		reg = <0x0d>;
-		phy-connection-type = "qsgmii";
-	};
-	mdio1_phy7: emdio1_phy@7 {
-		reg = <0x0e>;
-		phy-connection-type = "qsgmii";
-	};
-	mdio1_phy8: emdio1_phy@8 {
-		reg = <0x0f>;
-		phy-connection-type = "qsgmii";
-	};
-};
-
-&emdio2 {
-	/* Aquantia AQR105 10G PHY */
-	mdio2_phy1: emdio2_phy@1 {
-		compatible = "ethernet-phy-ieee802.3-c45";
-		interrupts = <0 2 0x4>;
-		reg = <0x0>;
-		phy-connection-type = "xfi";
-	};
-};
-
-/* DPMAC connections to external PHYs
- * based on LS1088A RM RevC - $24.1.2 SerDes Options
- */
-/* DPMAC1 is 10G SFP+, fixed link */
-&dpmac2 {
-	phy-handle = <&mdio2_phy1>;
-};
-&dpmac3 {
-	phy-handle = <&mdio1_phy5>;
-};
-&dpmac4 {
-	phy-handle = <&mdio1_phy6>;
-};
-&dpmac5 {
-	phy-handle = <&mdio1_phy7>;
-};
-&dpmac6 {
-	phy-handle = <&mdio1_phy8>;
-};
-&dpmac7 {
-	phy-handle = <&mdio1_phy1>;
-};
-&dpmac8 {
-	phy-handle = <&mdio1_phy2>;
-};
-&dpmac9 {
-	phy-handle = <&mdio1_phy3>;
-};
-&dpmac10 {
-	phy-handle = <&mdio1_phy4>;
-};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
index 76c3ecb4054e..1c25893c7cba 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
@@ -393,32 +393,6 @@
 			#interrupt-cells = <2>;
 		};
 
-		/* TODO: WRIOP (CCSR?) */
-		emdio1: mdio@8B96000 { /* WRIOP0: 0x8B8_0000,
-					  * E-MDIO1: 0x1_6000
-					  */
-			compatible = "fsl,fman-memac-mdio";
-			reg = <0x0 0x8B96000 0x0 0x1000>;
-			device_type = "mdio";
-			little-endian;	/* force the driver in LE mode */
-
-			/* Not necessary on the QDS, but needed on the RDB */
-			#address-cells = <1>;
-			#size-cells = <0>;
-		};
-
-		emdio2: mdio@8B97000 { /* WRIOP0: 0x8B8_0000,
-					  * E-MDIO2: 0x1_7000
-					  */
-			compatible = "fsl,fman-memac-mdio";
-			reg = <0x0 0x8B97000 0x0 0x1000>;
-			device_type = "mdio";
-			little-endian;	/* force the driver in LE mode */
-
-			#address-cells = <1>;
-			#size-cells = <0>;
-		};
-
 		ifc: ifc@2240000 {
 			compatible = "fsl,ifc", "simple-bus";
 			reg = <0x0 0x2240000 0x0 0x20000>;