diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-12-26 23:27:52 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-12-26 23:27:52 +0000 |
commit | 961d5b4453e785abd2b053977af54681d64b0b09 (patch) | |
tree | e4e7e6b80657664175b1492d2ff2123ee2be6788 /target/linux/brcm47xx/patches-3.10/208-b44-add-dummy-phy-device-if-we-do-not-find-any.patch | |
parent | bc3d934148144bd0bb67e5a8c569bc707e57bf9e (diff) | |
download | upstream-961d5b4453e785abd2b053977af54681d64b0b09.tar.gz upstream-961d5b4453e785abd2b053977af54681d64b0b09.tar.bz2 upstream-961d5b4453e785abd2b053977af54681d64b0b09.zip |
brcm47xx: b44: This updates the phylib patches to the version send upstream
This uses a fixed phy instead of a dummy one.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 39166
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/208-b44-add-dummy-phy-device-if-we-do-not-find-any.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.10/208-b44-add-dummy-phy-device-if-we-do-not-find-any.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/208-b44-add-dummy-phy-device-if-we-do-not-find-any.patch b/target/linux/brcm47xx/patches-3.10/208-b44-add-dummy-phy-device-if-we-do-not-find-any.patch deleted file mode 100644 index db6e5e3eba..0000000000 --- a/target/linux/brcm47xx/patches-3.10/208-b44-add-dummy-phy-device-if-we-do-not-find-any.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1a900b17b34ddca0336c739a2836bcb7f8aad5a8 Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens <hauke@hauke-m.de> -Date: Fri, 25 Oct 2013 00:03:33 +0200 -Subject: [PATCH 9/9] b44: add dummy phy device if we do not find any - ---- - drivers/net/ethernet/broadcom/b44.c | 25 +++++++++++++++++++++---- - 1 file changed, 21 insertions(+), 4 deletions(-) - ---- a/drivers/net/ethernet/broadcom/b44.c -+++ b/drivers/net/ethernet/broadcom/b44.c -@@ -2222,6 +2222,7 @@ static int b44_register_phy_one(struct b - struct ssb_device *sdev = bp->sdev; - struct phy_device *phydev; - int err; -+ struct phy_c45_device_ids c45_ids = {0}; - - mii_bus = mdiobus_alloc(); - if (!mii_bus) { -@@ -2256,9 +2257,20 @@ static int b44_register_phy_one(struct b - - phydev = bp->mii_bus->phy_map[bp->phy_addr]; - if (!phydev) { -- dev_err(sdev->dev, "could not find PHY at %i\n", bp->phy_addr); -- err = -ENODEV; -- goto err_out_mdiobus_unregister; -+ dev_info(sdev->dev, "could not find PHY at %i, create dummy one\n", -+ bp->phy_addr); -+ -+ phydev = phy_device_create(bp->mii_bus, bp->phy_addr, 0x0, false, &c45_ids); -+ if (IS_ERR(phydev)) { -+ err = PTR_ERR(phydev); -+ dev_err(sdev->dev, "Can not create dummy PHY\n"); -+ goto err_out_mdiobus_unregister; -+ } -+ err = phy_device_register(phydev); -+ if (err) { -+ dev_err(sdev->dev, "failed to register MII bus\n"); -+ goto err_out_mdiobus_unregister; -+ } - } - - err = phy_connect_direct(bp->dev, phydev, &b44_adjust_link, |