Merge branch 'u-boot-pxa/master' into 'u-boot-arm/master'

[u-boot] / drivers / net / fm / p4080.c

diff --git a/drivers/net/fm/p4080.c b/drivers/net/fm/p4080.c
index 791caab7ecda51772c086d12e9f573e7e0dc3d39..b04fd0f6562569cea9a5799a88f6922258042da7 100644 (file)
--- a/drivers/net/fm/p4080.c
+++ b/drivers/net/fm/p4080.c
@@ -23,7 +23,7 @@
 #include <asm/immap_85xx.h>
 #include <asm/fsl_serdes.h>
 
-u32 port_to_devdisr[] = {
+static u32 port_to_devdisr[] = {
        [FM1_DTSEC1] = FSL_CORENET_DEVDISR2_DTSEC1_1,
        [FM1_DTSEC2] = FSL_CORENET_DEVDISR2_DTSEC1_2,
        [FM1_DTSEC3] = FSL_CORENET_DEVDISR2_DTSEC1_3,
@@ -47,6 +47,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]);
 }