lkml.org 
[lkml]   [2018]   [Aug]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 17/29] net: davinci_emac: use eth_platform_get_mac_address()
    Date
    From: Bartosz Golaszewski <bgolaszewski@baylibre.com>

    We now support nvmem in eth_platform_get_mac_address() and all boards
    have the mac-address cells defined. Stop getting the MAC from pdata
    and use the dedicated helper.

    Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
    ---
    drivers/net/ethernet/ti/davinci_emac.c | 12 ++++--------
    1 file changed, 4 insertions(+), 8 deletions(-)

    diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
    index f270beebb428..5d01bad4baa5 100644
    --- a/drivers/net/ethernet/ti/davinci_emac.c
    +++ b/drivers/net/ethernet/ti/davinci_emac.c
    @@ -1700,7 +1700,6 @@ davinci_emac_of_get_pdata(struct platform_device *pdev, struct emac_priv *priv)
    const struct of_device_id *match;
    const struct emac_platform_data *auxdata;
    struct emac_platform_data *pdata = NULL;
    - const u8 *mac_addr;

    if (!IS_ENABLED(CONFIG_OF) || !pdev->dev.of_node)
    return dev_get_platdata(&pdev->dev);
    @@ -1712,12 +1711,6 @@ davinci_emac_of_get_pdata(struct platform_device *pdev, struct emac_priv *priv)
    np = pdev->dev.of_node;
    pdata->version = EMAC_VERSION_2;

    - if (!is_valid_ether_addr(pdata->mac_addr)) {
    - mac_addr = of_get_mac_address(np);
    - if (mac_addr)
    - ether_addr_copy(pdata->mac_addr, mac_addr);
    - }
    -
    of_property_read_u32(np, "ti,davinci-ctrl-reg-offset",
    &pdata->ctrl_reg_offset);

    @@ -1819,8 +1812,11 @@ static int davinci_emac_probe(struct platform_device *pdev)
    goto err_free_netdev;
    }

    + rc = eth_platform_get_mac_address(&pdev->dev, priv->mac_addr);
    + if (rc == -EPROBE_DEFER)
    + return -EPROBE_DEFER; /* We'll get the MAC address later. */
    +
    /* MAC addr and PHY mask , RMII enable info from platform_data */
    - memcpy(priv->mac_addr, pdata->mac_addr, ETH_ALEN);
    priv->phy_id = pdata->phy_id;
    priv->rmii_en = pdata->rmii_en;
    priv->version = pdata->version;
    --
    2.18.0
    \
     
     \ /
      Last update: 2018-08-10 10:08    [W:4.389 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site