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 <B38611@freescale.com>

diff --git a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
index 81d88b6a8fce7ea3b0c3baa47fc02d5a20d89527..f7165d5ecb148609bd5473fe2720f32fd30094ed 100644 (file)
--- 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 = <&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";
+
+       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 = <&ethphy0>;
        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 1af0d4e52d448c8f6e22f8ba3ce6a9b014e8a18a..30b8f3308ee0a510067133687ed5d03c16d4c65e 100644 (file)
--- 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 = <&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";
+
+       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 = <&ethphy0>;
        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 3477d25a98d1c2166649fae751410f967a35568e..b3f9e88463307a62d743372bd0112e3809511646 100644 (file)
--- 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 = <&ethphy1>;
        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 = <&ethphy0>;
        fsl,num_tx_queues=<3>;
        fsl,num_rx_queues=<3>;
        fsl,magic-packet;