lkml.org 
[lkml]   [2017]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next 4/4] net: dsa: bcm_sf2: Remove special handling of "internal" phy-mode
    Date
    The PHY library now supports an "internal" phy-mode, thus making our
    custom parsing code now unnecessary.

    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    ---
    drivers/net/dsa/bcm_sf2.c | 16 +++++-----------
    1 file changed, 5 insertions(+), 11 deletions(-)

    diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
    index 76e98e8ed315..648f91b58d1e 100644
    --- a/drivers/net/dsa/bcm_sf2.c
    +++ b/drivers/net/dsa/bcm_sf2.c
    @@ -498,10 +498,8 @@ static void bcm_sf2_identify_ports(struct bcm_sf2_priv *priv,
    struct device_node *dn)
    {
    struct device_node *port;
    - const char *phy_mode_str;
    int mode;
    unsigned int port_num;
    - int ret;

    priv->moca_port = -1;

    @@ -515,15 +513,11 @@ static void bcm_sf2_identify_ports(struct bcm_sf2_priv *priv,
    * time
    */
    mode = of_get_phy_mode(port);
    - if (mode < 0) {
    - ret = of_property_read_string(port, "phy-mode",
    - &phy_mode_str);
    - if (ret < 0)
    - continue;
    -
    - if (!strcasecmp(phy_mode_str, "internal"))
    - priv->int_phy_mask |= 1 << port_num;
    - }
    + if (mode < 0)
    + continue;
    +
    + if (mode == PHY_INTERFACE_MODE_INTERNAL)
    + priv->int_phy_mask |= 1 << port_num;

    if (mode == PHY_INTERFACE_MODE_MOCA)
    priv->moca_port = port_num;
    --
    2.9.3
    \
     
     \ /
      Last update: 2017-06-23 19:35    [W:2.792 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site