From: David S. Miller Date: Sun, 17 Jul 2016 04:33:12 +0000 (-0700) Subject: Merge branch 'hisilicon-mdio-femac' X-Git-Tag: MMI-PSA29.97-13-9~7505^2~86 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=009722a2ff079bf58d3ba3378eb6d898e1fc4b31;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'hisilicon-mdio-femac' Dongpo Li says: ==================== Add Hisilicon MDIO bus driver and FEMAC driver This patch set adds a Hisilicon MDIO bus driver and a Fast Ethernet MAC(FEMAC) driver. We also abstract a general interface "of_phy_get_and_connect" for PHY connect. User will have no bother with getting "phy-mode" and "phy-handle" any more. Changes in v1: - Pass private data structure instead of struct mii_bus in MDIO read and write operation. - Return the error which devm_clk_get() gives when MDIO probe. - Leave the clock unprepared and disabled on error when MDIO probe. - Abstract a general interface "of_phy_get_and_connect" for PHY connect. - Remove the "_reset" suffixes in "reset-names" property. - Enable tx per-packet interrupt when tx fifo full. - Remove pointless compatible and add SoC specific compatible. - Declare only one clock in MAC dts documentation. - Add standard unit suffixes for "phy-reset-delays". - Use a smaller NAPI poll weight 16 for our Fast Ethernet MAC. - Use phy_ethtool_{get|set}_link_ksettings for ethtool ops. - Use phydev from struct net_device in MAC driver. ==================== Signed-off-by: David S. Miller --- 009722a2ff079bf58d3ba3378eb6d898e1fc4b31