diff options
| author | Fugang Duan <b38611@freescale.com> | 2015-01-30 13:43:03 +0800 |
|---|---|---|
| committer | Fugang Duan <b38611@freescale.com> | 2015-01-30 13:53:10 +0800 |
| commit | a7eaa10b4439bfa3d890c7aed73d7acda5098f8d (patch) | |
| tree | d443759fffc599d0b755acfc5e2d6e63477d3072 /arch | |
| parent | c0d09423760297ad97f30fa51c1ee1efab9d12d8 (diff) | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx6sx-17x17-arm2.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sx-19x19-arm2.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sx-sabreauto.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sx-sdb.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sx.dtsi | 2 |
5 files changed, 2 insertions, 16 deletions
diff --git a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts index b989ba74e211..936c7a6c97f9 100644 --- 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 = <ðphy1>; - 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 = <ðphy0>; - 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 9555c8c467cb..f1092fe95c64 100644 --- 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 = <ðphy1>; - 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 = <ðphy0>; - 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 bdf4b8eed3a4..7020d6e59695 100644 --- 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 = <ðphy1>; - 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 = <ðphy0>; - 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 2a117540c907..5204ac444626 100644 --- 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 d787c5d734a5..c8559c0afb20 100644 --- 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"; }; |