From: David S. Miller Date: Fri, 18 Dec 2015 19:46:06 +0000 (-0500) Subject: Merge branch 'cpsw-fixed-phy-dt-bugs' X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=62d2b157f4a1f354fe8d28db5b4891cdafe1a9c5;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'cpsw-fixed-phy-dt-bugs' David Rivshin says: ==================== drivers: net: cpsw: Fix bugs in fixed-link PHY DT parsing Commit 1f71e8c96fc654724723ce987e0a8b2aeb81746d ("drivers: net: cpsw: Add support for fixed-link PHY") added initial fixed-link PHY support for CPSW, but missed a few considerations. This series is based on the tip of the net tree. The first two patches fix user-visible errors in different hardware configurations. The third patch is for an internal reference counting issue. They are logically independent changes, but in the same function, so must be applied in order to apply cleanly. The first patch was originally submitted by Pascal Speck on December 4, but was not picked up by patchwork. I suspect that is because the patch was mangled by the mailer. I fixed the mangling and am including it in this series, as I believe it is the correct change. I have tested on the following hardware configurations: - (EVMSK) dual emac with two real MDIO-connected phys using RGMII-TXID - single emac with fixed-link using RGMII Testing of other CPSW emac configurations that folks may have would be appreciated. Changes from v1 [1]: - Split into 3 smaller patches. - Maintain 1f71e8c96fc6's preference for fixed-link over phy_id if they are both (incorrectly) specified in the slave node. - Update binding documentation to no longer say that phy_mode is also mutually exclusive with fixed-link. - Dropped unnecessary include of phy_fixed.h. [1] https://patchwork.ozlabs.org/patch/554989/ ==================== Signed-off-by: David S. Miller --- 62d2b157f4a1f354fe8d28db5b4891cdafe1a9c5