diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c index b868cbf19..ba81e2499 100644 --- a/drivers/net/smc91111.c +++ b/drivers/net/smc91111.c @@ -66,6 +66,7 @@ #include #include #include +#include /*--------------------------------------------------------------- . @@ -446,6 +447,7 @@ struct smc91c111_priv { struct mii_bus miibus; struct accessors a; void __iomem *base; + int qemu_fixup; }; #if (SMC_DEBUG > 2 ) @@ -882,6 +884,7 @@ static void smc91c111_enable(struct eth_device *edev) static int smc91c111_eth_open(struct eth_device *edev) { struct smc91c111_priv *priv = (struct smc91c111_priv *)edev->priv; + int ret; /* Configure the Receive/Phy Control register */ SMC_SELECT_BANK(priv, 0); @@ -889,8 +892,27 @@ static int smc91c111_eth_open(struct eth_device *edev) smc91c111_enable(edev); - return phy_device_connect(edev, &priv->miibus, 0, NULL, + ret = phy_device_connect(edev, &priv->miibus, 0, NULL, 0, PHY_INTERFACE_MODE_NA); + + if (ret) + return ret; + + if (priv->qemu_fixup && edev->phydev->phy_id == 0x00000000) { + struct phy_device *dev = edev->phydev; + + dev->speed = SPEED_100; + dev->duplex = DUPLEX_FULL; + dev->autoneg = !AUTONEG_ENABLE; + dev->force = 1; + dev->link = 1; + + dev_info(edev->parent, "phy with id 0x%08x detected this might be qemu\n", + dev->phy_id); + dev_info(edev->parent, "force link at 100Mpbs\n"); + } + + return 0; } static int smc91c111_eth_send(struct eth_device *edev, void *packet, @@ -1286,6 +1308,12 @@ static int smc91c111_probe(struct device_d *dev) priv = edev->priv; + if (dev->platform_data) { + struct smc91c111_pdata *pdata = dev->platform_data; + + priv->qemu_fixup = pdata->qemu_fixup; + } + priv->a = access_via_32bit; edev->init = smc91c111_init_dev; diff --git a/include/net/smc91111.h b/include/net/smc91111.h new file mode 100644 index 000000000..0b2d49bb1 --- /dev/null +++ b/include/net/smc91111.h @@ -0,0 +1,14 @@ +/* + * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD + * + * Under GPLv2 only + */ + +#ifndef __SMC91111_H__ +#define __SMC91111_H__ + +struct smc91c111_pdata { + int qemu_fixup; +}; + +#endif /* __SMC91111_H__ */