From 80f952fd638bc1269098376c9a2df7d4e0c82e81 Mon Sep 17 00:00:00 2001 From: Ioana Ciornei Date: Thu, 22 Apr 2021 12:52:17 +0300 Subject: [PATCH] arm64: dts: ls2088ardb: 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: 7d176f917a86 ("arm64: dts: ls208xa: accumulated change to ls208xa boards") Signed-off-by: Ioana Ciornei --- .../boot/dts/freescale/fsl-ls2088a-rdb.dts | 80 ------------------- .../arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 26 ------ 2 files changed, 106 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts index a32b0f6e9238..f6b4d75a258b 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts @@ -22,83 +22,3 @@ stdout-path = "serial1:115200n8"; }; }; - -&emdio1 { - status = "disabled"; - /* CS4340 PHYs */ - mdio1_phy1: emdio1_phy@1 { - reg = <0x10>; - phy-connection-type = "xfi"; - }; - mdio1_phy2: emdio1_phy@2 { - reg = <0x11>; - phy-connection-type = "xfi"; - }; - mdio1_phy3: emdio1_phy@3 { - reg = <0x12>; - phy-connection-type = "xfi"; - }; - mdio1_phy4: emdio1_phy@4 { - reg = <0x13>; - phy-connection-type = "xfi"; - }; -}; - -&emdio2 { - /* AQR405 PHYs */ - mdio2_phy1: emdio2_phy@1 { - compatible = "ethernet-phy-ieee802.3-c45"; - interrupts = <0 1 0x4>; /* Level high type */ - reg = <0x0>; - phy-connection-type = "xfi"; - }; - mdio2_phy2: emdio2_phy@2 { - compatible = "ethernet-phy-ieee802.3-c45"; - interrupts = <0 2 0x4>; /* Level high type */ - reg = <0x1>; - phy-connection-type = "xfi"; - }; - mdio2_phy3: emdio2_phy@3 { - compatible = "ethernet-phy-ieee802.3-c45"; - interrupts = <0 4 0x4>; /* Level high type */ - reg = <0x2>; - phy-connection-type = "xfi"; - }; - mdio2_phy4: emdio2_phy@4 { - compatible = "ethernet-phy-ieee802.3-c45"; - interrupts = <0 5 0x4>; /* Level high type */ - reg = <0x3>; - phy-connection-type = "xfi"; - }; -}; - -/* Update DPMAC connections to external PHYs, under the assumption of - * SerDes 0x2a_0x41. This is currently the only SerDes supported on the board. - */ -/* Leave Cortina PHYs commented out until proper driver is integrated - *&dpmac1 { - * phy-handle = <&mdio1_phy1>; - *}; - *&dpmac2 { - * phy-handle = <&mdio1_phy2>; - *}; - *&dpmac3 { - * phy-handle = <&mdio1_phy3>; - *}; - *&dpmac4 { - * phy-handle = <&mdio1_phy4>; - *}; - */ - -&dpmac5 { - phy-handle = <&mdio2_phy1>; -}; -&dpmac6 { - phy-handle = <&mdio2_phy2>; -}; -&dpmac7 { - phy-handle = <&mdio2_phy3>; -}; -&dpmac8 { - phy-handle = <&mdio2_phy4>; -}; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi index ca49fd148cf4..d739ebc8c5bd 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi @@ -714,32 +714,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"; /* TODO: is this necessary? */ - 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"; /* TODO: is this necessary? */ - little-endian; /* force the driver in LE mode */ - - #address-cells = <1>; - #size-cells = <0>; - }; - i2c0: i2c@2000000 { status = "disabled"; compatible = "fsl,vf610-i2c", "fsl,ls208xa-vf610-i2c"; -- 2.17.1