Commit c592286a authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by David S. Miller

net: dpaa2-mac: use .mac_select_pcs() interface

Convert dpaa2-mac to use the mac_select_pcs() interface rather than
using phylink_set_pcs(). The intention here is to unify the approach
for PCS and eventually to remove phylink_set_pcs().
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 098db2f0
...@@ -100,6 +100,14 @@ static int dpaa2_mac_get_if_mode(struct fwnode_handle *dpmac_node, ...@@ -100,6 +100,14 @@ static int dpaa2_mac_get_if_mode(struct fwnode_handle *dpmac_node,
return err; return err;
} }
static struct phylink_pcs *dpaa2_mac_select_pcs(struct phylink_config *config,
phy_interface_t interface)
{
struct dpaa2_mac *mac = phylink_to_dpaa2_mac(config);
return mac->pcs;
}
static void dpaa2_mac_config(struct phylink_config *config, unsigned int mode, static void dpaa2_mac_config(struct phylink_config *config, unsigned int mode,
const struct phylink_link_state *state) const struct phylink_link_state *state)
{ {
...@@ -172,6 +180,7 @@ static void dpaa2_mac_link_down(struct phylink_config *config, ...@@ -172,6 +180,7 @@ static void dpaa2_mac_link_down(struct phylink_config *config,
static const struct phylink_mac_ops dpaa2_mac_phylink_ops = { static const struct phylink_mac_ops dpaa2_mac_phylink_ops = {
.validate = phylink_generic_validate, .validate = phylink_generic_validate,
.mac_select_pcs = dpaa2_mac_select_pcs,
.mac_config = dpaa2_mac_config, .mac_config = dpaa2_mac_config,
.mac_link_up = dpaa2_mac_link_up, .mac_link_up = dpaa2_mac_link_up,
.mac_link_down = dpaa2_mac_link_down, .mac_link_down = dpaa2_mac_link_down,
...@@ -303,9 +312,6 @@ int dpaa2_mac_connect(struct dpaa2_mac *mac) ...@@ -303,9 +312,6 @@ int dpaa2_mac_connect(struct dpaa2_mac *mac)
} }
mac->phylink = phylink; mac->phylink = phylink;
if (mac->pcs)
phylink_set_pcs(mac->phylink, mac->pcs);
err = phylink_fwnode_phy_connect(mac->phylink, dpmac_node, 0); err = phylink_fwnode_phy_connect(mac->phylink, dpmac_node, 0);
if (err) { if (err) {
netdev_err(net_dev, "phylink_fwnode_phy_connect() = %d\n", err); netdev_err(net_dev, "phylink_fwnode_phy_connect() = %d\n", err);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment