From: David S. Miller Date: Sun, 21 Jun 2020 04:38:26 +0000 (-0700) Subject: Merge branch 'Marvell-mvpp2-improvements' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=29a720c1042f469c8fea317cb5e7f496b116e07d;p=linux.git Merge branch 'Marvell-mvpp2-improvements' Russell King says: ==================== Marvell mvpp2 improvements This series primarily cleans up mvpp2, but also fixes a left-over from 91a208f2185a ("net: phylink: propagate resolved link config via mac_link_up()"). Patch 1 introduces some port helpers: mvpp2_port_supports_xlg() - does the port support the XLG MAC mvpp2_port_supports_rgmii() - does the port support RGMII modes Patch 2 introduces mvpp2_phylink_to_port(), rather than having repeated open coding of container_of(). Patch 3 introduces mvpp2_modify(), which reads-modifies-writes a register - I've converted the phylink specific code to use this helper. Patch 4 moves the hardware control of the pause modes from mvpp2_xlg_config() (which is called via the phylink_config method) to mvpp2_mac_link_up() - a change that was missed in the above referenced commit. v2: remove "inline" in patch 2. ==================== Signed-off-by: David S. Miller --- 29a720c1042f469c8fea317cb5e7f496b116e07d