fm: Don't allow disabling of FM1-DTSEC1

[oweals/u-boot.git] / drivers / net / fm / p3060.c

diff --git a/drivers/net/fm/p3060.c b/drivers/net/fm/p3060.c
index b25bca7cc374a212e10ebcc4b90b894892c36f0b..c9748a954cca44eda07323f013f7d49a457f7d4c 100644 (file)
--- a/drivers/net/fm/p3060.c
+++ b/drivers/net/fm/p3060.c
@@ -45,6 +45,11 @@ static int is_device_disabled(enum fm_port port)
 void fman_disable_port(enum fm_port port)
 {
        ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
+
+       /* don't allow disabling of DTSEC1 as its needed for MDIO */
+       if (port == FM1_DTSEC1)
+               return;
+
        setbits_be32(&gur->devdisr2, port_to_devdisr[port]);
 }
 
@@ -52,7 +57,6 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
 {
        ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
        u32 rcwsr11 = in_be32(&gur->rcwsr[11]);
-       u32 rcwsr13 = in_be32(&gur->rcwsr[13]);
 
        if (is_device_disabled(port))
                return PHY_INTERFACE_MODE_NONE;
@@ -70,22 +74,6 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
                FSL_CORENET_RCWSR11_EC2_FM2_DTSEC1))
                return PHY_INTERFACE_MODE_RGMII;
 
-       if ((port == FM1_DTSEC4) && ((rcwsr13 & FSL_CORENET_RCWSR13_EC1_EXT) ==
-               FSL_CORENET_RCWSR13_EC1_EXT_FM1_DTSEC4_RGMII))
-               return PHY_INTERFACE_MODE_RGMII;
-
-       if ((port == FM1_DTSEC4) && ((rcwsr13 & FSL_CORENET_RCWSR13_EC1_EXT) ==
-               FSL_CORENET_RCWSR13_EC1_EXT_FM1_DTSEC4_MII))
-               return PHY_INTERFACE_MODE_MII;
-
-       if ((port == FM2_DTSEC4) && ((rcwsr13 & FSL_CORENET_RCWSR13_EC2_EXT) ==
-               FSL_CORENET_RCWSR13_EC2_EXT_FM2_DTSEC4_RGMII))
-               return PHY_INTERFACE_MODE_RGMII;
-
-       if ((port == FM2_DTSEC4) && ((rcwsr13 & FSL_CORENET_RCWSR13_EC2_EXT) ==
-               FSL_CORENET_RCWSR13_EC2_EXT_FM2_DTSEC4_MII))
-               return PHY_INTERFACE_MODE_MII;
-
        switch (port) {
        case FM1_DTSEC1:
        case FM1_DTSEC2: