From e1c70cdbcbf7225fc2461a512257549bcb9522ca Mon Sep 17 00:00:00 2001 From: Fugang Duan Date: Mon, 13 Oct 2014 17:17:27 +0800 Subject: [PATCH] MLK-9977 ARM: dts: imx6sx: specify the phy address Since fec controller contain mdio bus, for imx serial chips, there have no independent/external MDIO bus. ENET1 and ENET2 share use ENET1 mdio bus. So, specify the phy address for two MACs. Signed-off-by: Fugang Duan --- arch/arm/boot/dts/imx6sx-17x17-arm2.dts | 19 +++++++++++++++++-- arch/arm/boot/dts/imx6sx-19x19-arm2.dts | 19 +++++++++++++++++-- arch/arm/boot/dts/imx6sx-sabreauto.dts | 19 +++++++++++++++++-- 3 files changed, 51 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts index 81d88b6a8fce..f7165d5ecb14 100644 --- a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts +++ b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts @@ -140,19 +140,34 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet1_1>; phy-mode = "rgmii"; - phy-id = <1>; + 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"; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + + ethphy0: ethernet-phy@0 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <0>; + }; + + ethphy1: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <1>; + }; + }; }; &fec2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet2_1>; phy-mode = "rgmii"; - phy-id = <0>; + phy-handle = <ðphy0>; fsl,num_tx_queues=<3>; fsl,num_rx_queues=<3>; pinctrl-assert-gpios = <&max7322_2 0 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts index 1af0d4e52d44..30b8f3308ee0 100644 --- a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts +++ b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts @@ -113,19 +113,34 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet1_1>; phy-mode = "rgmii"; - phy-id = <1>; + 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"; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + + ethphy0: ethernet-phy@0 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <0>; + }; + + ethphy1: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <1>; + }; + }; }; &fec2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet2_1>; phy-mode = "rgmii"; - phy-id = <0>; + phy-handle = <ðphy0>; fsl,num_tx_queues=<3>; fsl,num_rx_queues=<3>; pinctrl-assert-gpios = <&max7322_2 0 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts b/arch/arm/boot/dts/imx6sx-sabreauto.dts index 3477d25a98d1..b3f9e8846330 100644 --- a/arch/arm/boot/dts/imx6sx-sabreauto.dts +++ b/arch/arm/boot/dts/imx6sx-sabreauto.dts @@ -507,19 +507,34 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet1_1>; phy-mode = "rgmii"; - phy-id = <1>; + 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"; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + + ethphy0: ethernet-phy@0 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <0>; + }; + + ethphy1: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <1>; + }; + }; }; &fec2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet2_1>; phy-mode = "rgmii"; - phy-id = <0>; + phy-handle = <ðphy0>; fsl,num_tx_queues=<3>; fsl,num_rx_queues=<3>; fsl,magic-packet; -- 2.39.5