ARM: dts: imx6ul: segin: Make FEC and ethphy configurable in dts

To disable Ethernet interfaces in case they are not populated
make the FEC and Ethernet PHY status configurable in the dts files.

Also change the Ethernet PHYs labels to make them correspond to
the MDIO address.

Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi
index 73266b4..fee7a7e 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi
+++ b/arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi
@@ -42,20 +42,21 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_enet1>;
        phy-mode = "rmii";
-       phy-handle = <&ethphy0>;
-       status = "okay";
+       phy-handle = <&ethphy1>;
+       status = "disabled";
 
        mdio: mdio {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               ethphy0: ethernet-phy@1 {
+               ethphy1: ethernet-phy@1 {
                        reg = <1>;
                        interrupt-parent = <&gpio1>;
                        interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
                        micrel,led-mode = <1>;
                        clocks = <&clks IMX6UL_CLK_ENET_REF>;
                        clock-names = "rmii-ref";
+                       status = "disabled";
                };
        };
 };

diff --git a/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts b/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts
index dc06029..81a82dd 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts
+++ b/arch/arm/boot/dts/imx6ul-phytec-segin-ff-rdk-nand.dts
@@ -34,6 +34,18 @@
        status = "okay";
 };
 
+&ethphy1 {
+       status = "okay";
+};
+
+&ethphy2 {
+       status = "okay";
+};
+
+&fec1 {
+       status = "okay";
+};
+
 &fec2 {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi b/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi
index 28ba3a4..7cd24ec 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi
+++ b/arch/arm/boot/dts/imx6ul-phytec-segin.dtsi
@@ -107,7 +107,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_enet2>;
        phy-mode = "rmii";
-       phy-handle = <&ethphy1>;
+       phy-handle = <&ethphy2>;
        status = "disabled";
 };
 
@@ -160,11 +160,12 @@
 };
 
 &mdio {
-       ethphy1: ethernet-phy@2 {
+       ethphy2: ethernet-phy@2 {
                reg = <2>;
                micrel,led-mode = <1>;
                clocks = <&clks IMX6UL_CLK_ENET2_REF>;
                clock-names = "rmii-ref";
+               status = "disabled";
        };
 };