arm64: dts: fsl-ls1028a-qds: Drop overlay syntax hard coding

As suggested by commit 9ae8578b517a ("of: Documentation: change overlay
example to use current syntax"), there is no need to have overlay syntax
be hard coded in the device tree source file any more.

Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-13bb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-13bb.dts
index f748a2c12a70e4767d6b6934c5150738f3c55e4d..f826392c23faf2bd56bdf4d77383fc3022a61ff6 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-13bb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-13bb.dts
@@ -12,102 +12,80 @@
 /dts-v1/;
 /plugin/;
 
-/ {
-       fragment@0 {
-               target = <&mdio_slot1>;
-
-               __overlay__ {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       slot1_sgmii: ethernet-phy@2 {
-                               /* AQR112 */
-                               reg = <0x2>;
-                               compatible = "ethernet-phy-ieee802.3-c45";
-                       };
-               };
-       };
-
-       fragment@1 {
-               target = <&enetc_port0>;
-
-               __overlay__ {
-                       phy-handle = <&slot1_sgmii>;
-                       phy-mode = "usxgmii";
-                       managed = "in-band-status";
-                       status = "okay";
-               };
+&mdio_slot1 {
+       #address-cells = <1>;
+       #size-cells = <0>;
+
+       slot1_sgmii: ethernet-phy@2 {
+               /* AQR112 */
+               reg = <0x2>;
+               compatible = "ethernet-phy-ieee802.3-c45";
        };
+};
 
-       fragment@2 {
-               target = <&mdio_slot2>;
-
-               __overlay__ {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       /* 4 ports on AQR412 */
-                       slot2_qxgmii0: ethernet-phy@0 {
-                               reg = <0x0>;
-                               compatible = "ethernet-phy-ieee802.3-c45";
-                       };
-
-                       slot2_qxgmii1: ethernet-phy@1 {
-                               reg = <0x1>;
-                               compatible = "ethernet-phy-ieee802.3-c45";
-                       };
+&enetc_port0 {
+       phy-handle = <&slot1_sgmii>;
+       phy-mode = "usxgmii";
+       managed = "in-band-status";
+       status = "okay";
+};
 
-                       slot2_qxgmii2: ethernet-phy@2 {
-                               reg = <0x2>;
-                               compatible = "ethernet-phy-ieee802.3-c45";
-                       };
+&mdio_slot2 {
+       #address-cells = <1>;
+       #size-cells = <0>;
 
-                       slot2_qxgmii3: ethernet-phy@3 {
-                               reg = <0x3>;
-                               compatible = "ethernet-phy-ieee802.3-c45";
-                       };
-               };
+       /* 4 ports on AQR412 */
+       slot2_qxgmii0: ethernet-phy@0 {
+               reg = <0x0>;
+               compatible = "ethernet-phy-ieee802.3-c45";
        };
 
-       fragment@3 {
-               target = <&mscc_felix_ports>;
+       slot2_qxgmii1: ethernet-phy@1 {
+               reg = <0x1>;
+               compatible = "ethernet-phy-ieee802.3-c45";
+       };
 
-               __overlay__ {
-                       port@0 {
-                               status = "okay";
-                               phy-handle = <&slot2_qxgmii0>;
-                               phy-mode = "usxgmii";
-                               managed = "in-band-status";
-                       };
+       slot2_qxgmii2: ethernet-phy@2 {
+               reg = <0x2>;
+               compatible = "ethernet-phy-ieee802.3-c45";
+       };
 
-                       port@1 {
-                               status = "okay";
-                               phy-handle = <&slot2_qxgmii1>;
-                               phy-mode = "usxgmii";
-                               managed = "in-band-status";
-                       };
+       slot2_qxgmii3: ethernet-phy@3 {
+               reg = <0x3>;
+               compatible = "ethernet-phy-ieee802.3-c45";
+       };
+};
 
-                       port@2 {
-                               status = "okay";
-                               phy-handle = <&slot2_qxgmii2>;
-                               phy-mode = "usxgmii";
-                               managed = "in-band-status";
-                       };
+&mscc_felix_ports {
+       port@0 {
+               status = "okay";
+               phy-handle = <&slot2_qxgmii0>;
+               phy-mode = "usxgmii";
+               managed = "in-band-status";
+       };
 
-                       port@3 {
-                               status = "okay";
-                               phy-handle = <&slot2_qxgmii3>;
-                               phy-mode = "usxgmii";
-                               managed = "in-band-status";
-                       };
-               };
+       port@1 {
+               status = "okay";
+               phy-handle = <&slot2_qxgmii1>;
+               phy-mode = "usxgmii";
+               managed = "in-band-status";
        };
 
-       fragment@4 {
-               target = <&mscc_felix>;
+       port@2 {
+               status = "okay";
+               phy-handle = <&slot2_qxgmii2>;
+               phy-mode = "usxgmii";
+               managed = "in-band-status";
+       };
 
-               __overlay__ {
-                       status = "okay";
-               };
+       port@3 {
+               status = "okay";
+               phy-handle = <&slot2_qxgmii3>;
+               phy-mode = "usxgmii";
+               managed = "in-band-status";
        };
 };
+
+&mscc_felix {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-65bb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-65bb.dts
index 8ffb707a15765d3a1d78b5e9c37d043fbcbf3880..40d34c8384a5e10392896320a383a449559df086 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-65bb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-65bb.dts
@@ -11,98 +11,76 @@
 /dts-v1/;
 /plugin/;
 
-/ {
-       fragment@0 {
-               target = <&mdio_slot1>;
-
-               __overlay__ {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       slot1_sgmii: ethernet-phy@2 {
-                               /* AQR112 */
-                               reg = <0x2>;
-                               compatible = "ethernet-phy-ieee802.3-c45";
-                       };
-               };
-       };
-
-       fragment@1 {
-               target = <&enetc_port0>;
-
-               __overlay__ {
-                       phy-handle = <&slot1_sgmii>;
-                       phy-mode = "2500base-x";
-                       managed = "in-band-status";
-                       status = "okay";
-               };
+&mdio_slot1 {
+       #address-cells = <1>;
+       #size-cells = <0>;
+
+       slot1_sgmii: ethernet-phy@2 {
+               /* AQR112 */
+               reg = <0x2>;
+               compatible = "ethernet-phy-ieee802.3-c45";
        };
+};
 
-       fragment@2 {
-               target = <&mdio_slot2>;
-
-               __overlay__ {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       /* 4 ports on VSC8514 */
-                       slot2_qsgmii0: ethernet-phy@8 {
-                               reg = <0x8>;
-                       };
-
-                       slot2_qsgmii1: ethernet-phy@9 {
-                               reg = <0x9>;
-                       };
+&enetc_port0 {
+       phy-handle = <&slot1_sgmii>;
+       phy-mode = "2500base-x";
+       managed = "in-band-status";
+       status = "okay";
+};
 
-                       slot2_qsgmii2: ethernet-phy@a {
-                               reg = <0xa>;
-                       };
+&mdio_slot2 {
+       #address-cells = <1>;
+       #size-cells = <0>;
 
-                       slot2_qsgmii3: ethernet-phy@b {
-                               reg = <0xb>;
-                       };
-               };
+       /* 4 ports on VSC8514 */
+       slot2_qsgmii0: ethernet-phy@8 {
+               reg = <0x8>;
        };
 
-       fragment@3 {
-               target = <&mscc_felix_ports>;
+       slot2_qsgmii1: ethernet-phy@9 {
+               reg = <0x9>;
+       };
 
-               __overlay__ {
-                       port@0 {
-                               status = "okay";
-                               phy-handle = <&slot2_qsgmii0>;
-                               phy-mode = "qsgmii";
-                               managed = "in-band-status";
-                       };
+       slot2_qsgmii2: ethernet-phy@a {
+               reg = <0xa>;
+       };
 
-                       port@1 {
-                               status = "okay";
-                               phy-handle = <&slot2_qsgmii1>;
-                               phy-mode = "qsgmii";
-                               managed = "in-band-status";
-                       };
+       slot2_qsgmii3: ethernet-phy@b {
+               reg = <0xb>;
+       };
+};
 
-                       port@2 {
-                               status = "okay";
-                               phy-handle = <&slot2_qsgmii2>;
-                               phy-mode = "qsgmii";
-                               managed = "in-band-status";
-                       };
+&mscc_felix_ports {
+       port@0 {
+               status = "okay";
+               phy-handle = <&slot2_qsgmii0>;
+               phy-mode = "qsgmii";
+               managed = "in-band-status";
+       };
 
-                       port@3 {
-                               status = "okay";
-                               phy-handle = <&slot2_qsgmii3>;
-                               phy-mode = "qsgmii";
-                               managed = "in-band-status";
-                       };
-               };
+       port@1 {
+               status = "okay";
+               phy-handle = <&slot2_qsgmii1>;
+               phy-mode = "qsgmii";
+               managed = "in-band-status";
        };
 
-       fragment@4 {
-               target = <&mscc_felix>;
+       port@2 {
+               status = "okay";
+               phy-handle = <&slot2_qsgmii2>;
+               phy-mode = "qsgmii";
+               managed = "in-band-status";
+       };
 
-               __overlay__ {
-                       status = "okay";
-               };
+       port@3 {
+               status = "okay";
+               phy-handle = <&slot2_qsgmii3>;
+               phy-mode = "qsgmii";
+               managed = "in-band-status";
        };
 };
+
+&mscc_felix {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-7777.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-7777.dts
index eb6a1e674f10605ed67c664affb3a74dcaf7e486..1dff68d7484b40e807f8d1be5343a715e5025fbe 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-7777.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-7777.dts
@@ -12,71 +12,58 @@
 /dts-v1/;
 /plugin/;
 
-/ {
-       fragment@0 {
-               target = <&mdio_slot1>;
+&mdio_slot1 {
+       #address-cells = <1>;
+       #size-cells = <0>;
 
-               __overlay__ {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       /* 4 ports on AQR412 */
-                       slot1_sxgmii0: ethernet-phy@0 {
-                               reg = <0x0>;
-                               compatible = "ethernet-phy-ieee802.3-c45";
-                       };
-
-                       slot1_sxgmii1: ethernet-phy@1 {
-                               reg = <0x1>;
-                               compatible = "ethernet-phy-ieee802.3-c45";
-                       };
-
-                       slot1_sxgmii2: ethernet-phy@2 {
-                               reg = <0x2>;
-                               compatible = "ethernet-phy-ieee802.3-c45";
-                       };
+       /* 4 ports on AQR412 */
+       slot1_sxgmii0: ethernet-phy@0 {
+               reg = <0x0>;
+               compatible = "ethernet-phy-ieee802.3-c45";
+       };
 
-                       slot1_sxgmii3: ethernet-phy@3 {
-                               reg = <0x3>;
-                               compatible = "ethernet-phy-ieee802.3-c45";
-                       };
-               };
+       slot1_sxgmii1: ethernet-phy@1 {
+               reg = <0x1>;
+               compatible = "ethernet-phy-ieee802.3-c45";
        };
 
-       fragment@1 {
-               target = <&mscc_felix_ports>;
+       slot1_sxgmii2: ethernet-phy@2 {
+               reg = <0x2>;
+               compatible = "ethernet-phy-ieee802.3-c45";
+       };
 
-               __overlay__ {
-                       port@0 {
-                               status = "okay";
-                               phy-handle = <&slot1_sxgmii0>;
-                               phy-mode = "2500base-x";
-                       };
+       slot1_sxgmii3: ethernet-phy@3 {
+               reg = <0x3>;
+               compatible = "ethernet-phy-ieee802.3-c45";
+       };
+};
 
-                       port@1 {
-                               status = "okay";
-                               phy-handle = <&slot1_sxgmii1>;
-                               phy-mode = "2500base-x";
-                       };
+&mscc_felix_ports {
+       port@0 {
+               status = "okay";
+               phy-handle = <&slot1_sxgmii0>;
+               phy-mode = "2500base-x";
+       };
 
-                       port@2 {
-                               status = "okay";
-                               phy-handle = <&slot1_sxgmii2>;
-                               phy-mode = "2500base-x";
-                       };
+       port@1 {
+               status = "okay";
+               phy-handle = <&slot1_sxgmii1>;
+               phy-mode = "2500base-x";
+       };
 
-                       port@3 {
-                               status = "okay";
-                               phy-handle = <&slot1_sxgmii3>;
-                               phy-mode = "2500base-x";
-                       };
-               };
+       port@2 {
+               status = "okay";
+               phy-handle = <&slot1_sxgmii2>;
+               phy-mode = "2500base-x";
        };
 
-       fragment@2 {
-               target = <&mscc_felix>;
-               __overlay__ {
-                       status = "okay";
-               };
+       port@3 {
+               status = "okay";
+               phy-handle = <&slot1_sxgmii3>;
+               phy-mode = "2500base-x";
        };
 };
+
+&mscc_felix {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-85bb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-85bb.dts
index 8e90c3088ba16d1d28f997c5ae76c86c21cd6876..19424d349713bf1f52586a84239c24011a666529 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-85bb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-85bb.dts
@@ -11,97 +11,75 @@
 /dts-v1/;
 /plugin/;
 
-/ {
-       fragment@0 {
-               target = <&mdio_slot1>;
+&mdio_slot1 {
+       #address-cells = <1>;
+       #size-cells = <0>;
 
-               __overlay__ {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       slot1_sgmii: ethernet-phy@1c {
-                               /* 1st port on VSC8234 */
-                               reg = <0x1c>;
-                       };
-               };
+       slot1_sgmii: ethernet-phy@1c {
+               /* 1st port on VSC8234 */
+               reg = <0x1c>;
        };
+};
 
-       fragment@1 {
-               target = <&enetc_port0>;
-
-               __overlay__ {
-                       phy-handle = <&slot1_sgmii>;
-                       phy-mode = "sgmii";
-                       managed = "in-band-status";
-                       status = "okay";
-               };
-       };
-
-       fragment@2 {
-               target = <&mdio_slot2>;
-
-               __overlay__ {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       /* 4 ports on VSC8514 */
-                       slot2_qsgmii0: ethernet-phy@8 {
-                               reg = <0x8>;
-                       };
-
-                       slot2_qsgmii1: ethernet-phy@9 {
-                               reg = <0x9>;
-                       };
+&enetc_port0 {
+       phy-handle = <&slot1_sgmii>;
+       phy-mode = "sgmii";
+       managed = "in-band-status";
+       status = "okay";
+};
 
-                       slot2_qsgmii2: ethernet-phy@a {
-                               reg = <0xa>;
-                       };
+&mdio_slot2 {
+       #address-cells = <1>;
+       #size-cells = <0>;
 
-                       slot2_qsgmii3: ethernet-phy@b {
-                               reg = <0xb>;
-                       };
-               };
+       /* 4 ports on VSC8514 */
+       slot2_qsgmii0: ethernet-phy@8 {
+               reg = <0x8>;
        };
 
-       fragment@3 {
-               target = <&mscc_felix_ports>;
+       slot2_qsgmii1: ethernet-phy@9 {
+               reg = <0x9>;
+       };
 
-               __overlay__ {
-                       port@0 {
-                               status = "okay";
-                               phy-handle = <&slot2_qsgmii0>;
-                               phy-mode = "qsgmii";
-                               managed = "in-band-status";
-                       };
+       slot2_qsgmii2: ethernet-phy@a {
+               reg = <0xa>;
+       };
 
-                       port@1 {
-                               status = "okay";
-                               phy-handle = <&slot2_qsgmii1>;
-                               phy-mode = "qsgmii";
-                               managed = "in-band-status";
-                       };
+       slot2_qsgmii3: ethernet-phy@b {
+               reg = <0xb>;
+       };
+};
 
-                       port@2 {
-                               status = "okay";
-                               phy-handle = <&slot2_qsgmii2>;
-                               phy-mode = "qsgmii";
-                               managed = "in-band-status";
-                       };
+&mscc_felix_ports {
+       port@0 {
+               status = "okay";
+               phy-handle = <&slot2_qsgmii0>;
+               phy-mode = "qsgmii";
+               managed = "in-band-status";
+       };
 
-                       port@3 {
-                               status = "okay";
-                               phy-handle = <&slot2_qsgmii3>;
-                               phy-mode = "qsgmii";
-                               managed = "in-band-status";
-                       };
-               };
+       port@1 {
+               status = "okay";
+               phy-handle = <&slot2_qsgmii1>;
+               phy-mode = "qsgmii";
+               managed = "in-band-status";
        };
 
-       fragment@4 {
-               target = <&mscc_felix>;
+       port@2 {
+               status = "okay";
+               phy-handle = <&slot2_qsgmii2>;
+               phy-mode = "qsgmii";
+               managed = "in-band-status";
+       };
 
-               __overlay__ {
-                       status = "okay";
-               };
+       port@3 {
+               status = "okay";
+               phy-handle = <&slot2_qsgmii3>;
+               phy-mode = "qsgmii";
+               managed = "in-band-status";
        };
 };
+
+&mscc_felix {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-899b.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-899b.dts
index 5d0a094e6c44160d107a3b7c67e7da4cd6ea23d3..fb85847f778fd6d006fddd7094a6eb5e0ff452f9 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-899b.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-899b.dts
@@ -11,65 +11,51 @@
 /dts-v1/;
 /plugin/;
 
-/ {
-       fragment@0 {
-               target = <&mdio_slot1>;
-               __overlay__ {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
+&mdio_slot1 {
+       #address-cells = <1>;
+       #size-cells = <0>;
 
-                       /* VSC8234 */
-                       slot1_sgmii0: ethernet-phy@1c {
-                               reg = <0x1c>;
-                       };
-
-                       slot1_sgmii1: ethernet-phy@1d {
-                               reg = <0x1d>;
-                       };
+       /* VSC8234 */
+       slot1_sgmii0: ethernet-phy@1c {
+               reg = <0x1c>;
+       };
 
-                       slot1_sgmii2: ethernet-phy@1e {
-                               reg = <0x1e>;
-                       };
+       slot1_sgmii1: ethernet-phy@1d {
+               reg = <0x1d>;
+       };
 
-                       slot1_sgmii3: ethernet-phy@1f {
-                               reg = <0x1f>;
-                       };
-               };
+       slot1_sgmii2: ethernet-phy@1e {
+               reg = <0x1e>;
        };
 
-       fragment@1 {
-               target = <&enetc_port0>;
-               __overlay__ {
-                       phy-handle = <&slot1_sgmii0>;
-                       phy-mode = "sgmii";
-                       managed = "in-band-status";
-                       status = "okay";
-               };
+       slot1_sgmii3: ethernet-phy@1f {
+               reg = <0x1f>;
        };
+};
 
-       fragment@2 {
-               target = <&mscc_felix_ports>;
-               __overlay__ {
-                       port@1 {
-                               status = "okay";
-                               phy-handle = <&slot1_sgmii1>;
-                               phy-mode = "sgmii";
-                               managed = "in-band-status";
-                       };
+&enetc_port0 {
+       phy-handle = <&slot1_sgmii0>;
+       phy-mode = "sgmii";
+       managed = "in-band-status";
+       status = "okay";
+};
 
-                       port@2 {
-                               status = "okay";
-                               phy-handle = <&slot1_sgmii2>;
-                               phy-mode = "sgmii";
-                               managed = "in-band-status";
-                       };
-               };
+&mscc_felix_ports {
+       port@1 {
+               status = "okay";
+               phy-handle = <&slot1_sgmii1>;
+               phy-mode = "sgmii";
+               managed = "in-band-status";
        };
 
-       fragment@3 {
-               target = <&mscc_felix>;
-               __overlay__ {
-                       status = "okay";
-               };
+       port@2 {
+               status = "okay";
+               phy-handle = <&slot1_sgmii2>;
+               phy-mode = "sgmii";
+               managed = "in-band-status";
        };
 };
+
+&mscc_felix {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-9999.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-9999.dts
index 1ef743c48e84ec1ed0ebd471ab93869921e6ac37..63e46fad22bd5d8b2674cd2ae68a3df943cc8fcc 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-9999.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds-9999.dts
@@ -11,69 +11,58 @@
 /dts-v1/;
 /plugin/;
 
-/ {
-       fragment@0 {
-               target = <&mdio_slot1>;
-               __overlay__ {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
+&mdio_slot1 {
+       #address-cells = <1>;
+       #size-cells = <0>;
 
-                       /* VSC8234 */
-                       slot1_sgmii0: ethernet-phy@1c {
-                               reg = <0x1c>;
-                       };
-
-                       slot1_sgmii1: ethernet-phy@1d {
-                               reg = <0x1d>;
-                       };
+       /* VSC8234 */
+       slot1_sgmii0: ethernet-phy@1c {
+               reg = <0x1c>;
+       };
 
-                       slot1_sgmii2: ethernet-phy@1e {
-                               reg = <0x1e>;
-                       };
+       slot1_sgmii1: ethernet-phy@1d {
+               reg = <0x1d>;
+       };
 
-                       slot1_sgmii3: ethernet-phy@1f {
-                               reg = <0x1f>;
-                       };
-               };
+       slot1_sgmii2: ethernet-phy@1e {
+               reg = <0x1e>;
        };
 
-       fragment@1 {
-               target = <&mscc_felix_ports>;
-               __overlay__ {
-                       port@0 {
-                               status = "okay";
-                               phy-handle = <&slot1_sgmii0>;
-                               phy-mode = "sgmii";
-                               managed = "in-band-status";
-                       };
+       slot1_sgmii3: ethernet-phy@1f {
+               reg = <0x1f>;
+       };
+};
 
-                       port@1 {
-                               status = "okay";
-                               phy-handle = <&slot1_sgmii1>;
-                               phy-mode = "sgmii";
-                               managed = "in-band-status";
-                       };
+&mscc_felix_ports {
+       port@0 {
+               status = "okay";
+               phy-handle = <&slot1_sgmii0>;
+               phy-mode = "sgmii";
+               managed = "in-band-status";
+       };
 
-                       port@2 {
-                               status = "okay";
-                               phy-handle = <&slot1_sgmii2>;
-                               phy-mode = "sgmii";
-                               managed = "in-band-status";
-                       };
+       port@1 {
+               status = "okay";
+               phy-handle = <&slot1_sgmii1>;
+               phy-mode = "sgmii";
+               managed = "in-band-status";
+       };
 
-                       port@3 {
-                               status = "okay";
-                               phy-handle = <&slot1_sgmii3>;
-                               phy-mode = "sgmii";
-                               managed = "in-band-status";
-                       };
-               };
+       port@2 {
+               status = "okay";
+               phy-handle = <&slot1_sgmii2>;
+               phy-mode = "sgmii";
+               managed = "in-band-status";
        };
 
-       fragment@2 {
-               target = <&mscc_felix>;
-               __overlay__ {
-                       status = "okay";
-               };
+       port@3 {
+               status = "okay";
+               phy-handle = <&slot1_sgmii3>;
+               phy-mode = "sgmii";
+               managed = "in-band-status";
        };
 };
+
+&mscc_felix {
+       status = "okay";
+};