MLK-10184 ARM: dts: imx6sx: clean up enet property and enable enet2 multi-queue

Clean up enet property and enebale enet2 multi-queue.

Signed-off-by: Fugang Duan <B38611@freescale.com>

diff --git a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
index b989ba74e211ad0b6c1aa2d9b8910bf6f81cc86c..936c7a6c97f9b8850f297849337fb257eebdc702 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
+++ b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
@@ -146,8 +146,6 @@
        pinctrl-0 = <&pinctrl_enet1_1>;
        phy-mode = "rgmii";
        phy-handle = <&ethphy1>;
-       fsl,num_tx_queues=<3>;
-       fsl,num_rx_queues=<3>;
        pinctrl-assert-gpios = <&max7322_1 0 GPIO_ACTIVE_HIGH>;
        fsl,magic-packet;
        status = "okay";
@@ -173,8 +171,6 @@
        pinctrl-0 = <&pinctrl_enet2_1>;
        phy-mode = "rgmii";
        phy-handle = <&ethphy0>;
-       fsl,num_tx_queues=<3>;
-       fsl,num_rx_queues=<3>;
        pinctrl-assert-gpios = <&max7322_2 0 GPIO_ACTIVE_HIGH>;
        fsl,magic-packet;
        status = "okay";

diff --git a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
index 9555c8c467cb353124a25cb504dbdf57e654f81f..f1092fe95c645523e16d66045f98c606a8b56999 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
+++ b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
@@ -119,8 +119,6 @@
        pinctrl-0 = <&pinctrl_enet1_1>;
        phy-mode = "rgmii";
        phy-handle = <&ethphy1>;
-       fsl,num_tx_queues=<3>;
-       fsl,num_rx_queues=<3>;
        pinctrl-assert-gpios = <&max7322_1 0 GPIO_ACTIVE_HIGH>;
        fsl,magic-packet;
        status = "okay";
@@ -146,8 +144,6 @@
        pinctrl-0 = <&pinctrl_enet2_1>;
        phy-mode = "rgmii";
        phy-handle = <&ethphy0>;
-       fsl,num_tx_queues=<3>;
-       fsl,num_rx_queues=<3>;
        pinctrl-assert-gpios = <&max7322_2 0 GPIO_ACTIVE_HIGH>;
        fsl,magic-packet;
        status = "okay";

diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts b/arch/arm/boot/dts/imx6sx-sabreauto.dts
index bdf4b8eed3a4a28c29a3fae343dfb2fc49579c89..7020d6e5969548d94a2b152ae338171beba3dd9d 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sabreauto.dts
+++ b/arch/arm/boot/dts/imx6sx-sabreauto.dts
@@ -507,8 +507,6 @@
        pinctrl-0 = <&pinctrl_enet1_1>;
        phy-mode = "rgmii";
        phy-handle = <&ethphy1>;
-       fsl,num_tx_queues=<3>;
-       fsl,num_rx_queues=<3>;
        pinctrl-assert-gpios = <&max7322 0 GPIO_ACTIVE_HIGH>;
        fsl,magic-packet;
        status = "okay";
@@ -534,8 +532,6 @@
        pinctrl-0 = <&pinctrl_enet2_1>;
        phy-mode = "rgmii";
        phy-handle = <&ethphy0>;
-       fsl,num_tx_queues=<3>;
-       fsl,num_rx_queues=<3>;
        fsl,magic-packet;
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts
index 2a117540c907c2ea2cd67be98dacfbd85faf5ac4..5204ac4446268413aaa8a6e37ea8535ab3d2ee39 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sdb.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb.dts
@@ -342,8 +342,6 @@
        pinctrl-0 = <&pinctrl_enet1>;
        pinctrl-assert-gpios = <&gpio4 16 GPIO_ACTIVE_HIGH>, <&gpio2 6 GPIO_ACTIVE_LOW>;
        phy-mode = "rgmii";
-       fsl,num_tx_queues=<3>;
-       fsl,num_rx_queues=<3>;
        status = "okay";
 };
 
@@ -351,8 +349,6 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_enet2>;
        phy-mode = "rgmii";
-       fsl,num_tx_queues=<3>;
-       fsl,num_rx_queues=<3>;
        status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index d787c5d734a54340d2a9e5251689ea73182bbe2c..c8559c0afb209352595e2604c2a4902486b8b7ba 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -1068,6 +1068,8 @@
                                         <&clks IMX6SX_CLK_ENET_PTP>;
                                clock-names = "ipg", "ahb", "ptp",
                                              "enet_clk_ref", "enet_out";
+                               fsl,num-tx-queues=<3>;
+                               fsl,num-rx-queues=<3>;
                                status = "disabled";
                        };