From patchwork Thu Jun 28 14:32:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10494185 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 659EE6022E for ; Thu, 28 Jun 2018 14:48:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4DA3C291E6 for ; Thu, 28 Jun 2018 14:48:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4202429C73; Thu, 28 Jun 2018 14:48:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CE66E291E6 for ; Thu, 28 Jun 2018 14:48:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=i3wKZe2LtJD6hrK+TjzFXoj6SjQqeSZgMGAOo9TGZ48=; b=KAsnQnOunjp3TDc8R1xp7yQmMm BMPI3YKCufLGvkDZN5b2A+4revx65fxE5oScRTaVwFslUjivXbrMl2fpyy9nxIaICMFIpvDw69kOl Ey+kqzv2vjaj/vz0a3eZ/66cymBVY//cc0Mn0Xl1RiSE5QVOhItsHwPm9e/ozIx1z5V1/VWczXCzJ guHF4sZXgeA3xmnp1zyHyOza2Mkg7kM8mGp6MivHVNqK+9ii94f8nCcF2KMgUN5v7dOS97at3T9Ea lX2fnJunyeGBbey7V8Ngc9050d68YP+hCuPY5T8ZsDFY9ao5u9f8el5ld9AkmW7wzzneDtstmvB0G 0yxFcO8w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fYYDn-0007da-6F; Thu, 28 Jun 2018 14:48:31 +0000 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fYXzG-00056R-Tt for linux-arm-kernel@lists.infradead.org; Thu, 28 Jun 2018 14:33:37 +0000 Received: by mail-wr0-x241.google.com with SMTP id p1-v6so5765178wrs.9 for ; Thu, 28 Jun 2018 07:33:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zArp1LhynJj6PtR0vOEIzjnAxQ8D1ftfqwxGbTe1BC8=; b=Tho2VFEoma3gScYSolCFaegTDcAIdusxa2EyCbSnryNnBYTkvc3NpDVGCVjQQ2PGAY ULGBFNug8kWtxZJRj90BdRMzf6Mvlad8HUo+8D3+5shfUxzmQIx2p2K79apVTIueBa9d aOXBePlopH3HMkhdrt2LkH0xAZNNxUymq/E8kUaEj+QCJBeRqf0Y7gvT3pY1fLldJIKY FTh+SV3eu3oG+WlwUMzG6Bj+As5XJvCBsgOl87Fh76guefu1RyMLFFieCdaNAlPwCeL2 2DwX3Mq7UzagZ0YDkuQTNl80rhpAUFtxrFgndhbpmUKyVgRUv1bh19dbVjoaduMS6or3 FQEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zArp1LhynJj6PtR0vOEIzjnAxQ8D1ftfqwxGbTe1BC8=; b=SQdIIgMtc6I3CESeknm/vk3DkyjNT8ApUxH4EbfbwWOHjpFVoJWSdilGUwsZ47NGth xUQhIEhi9n82SlW5n9gC6Ly/1nQ6YwX0Dx9QUGUkLNmuW+IyF5qbt3lIvqhLdkST0YEh 4GLBibx6EG9Y7RNVasTxmmbqkoLBMGDy3/lppOr34IW/ImKqMurCH9ypLqhQmTVasfxV 0zXtJ7uePE//D9CWST8mtItcWMWd7kPfwjhplXkhh5svmcVT3VIk4VUUgooNYgrtsulX sPjKftpZzll8wfq6cgljMPsS4MczYAg5//5e8+rVpmAjbocG5RJjGWvuGmJ3VCFL8lxk b3eQ== X-Gm-Message-State: APt69E3bKjsRoxHwCFtSvEjtXEWPUWqIiJxtiZMB0gWYViw3e54gGauS bybWxTMbL5oYQMARGviDDcuT+FLelGw= X-Google-Smtp-Source: AAOMgpferG7vInksNBqhlY07+BTByLC8v82b1odTpS39rwpuYeArbh8M1LBoj1wWwfwtvwXArHAa1w== X-Received: by 2002:adf:ba8c:: with SMTP id p12-v6mr2223104wrg.139.1530196399185; Thu, 28 Jun 2018 07:33:19 -0700 (PDT) Received: from brgl-bgdev.baylibre.local (AStLambert-681-1-87-41.w90-86.abo.wanadoo.fr. [90.86.29.41]) by smtp.gmail.com with ESMTPSA id 4-v6sm8037499wmh.14.2018.06.28.07.33.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 07:33:18 -0700 (PDT) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Russell King , Grygorii Strashko , "David S . Miller" , Srinivas Kandagatla , Lukas Wunner , Rob Herring , Florian Fainelli , Dan Carpenter , Ivan Khoronzhuk , David Lechner , Greg Kroah-Hartman , Andrew Lunn , Jonathan Corbet Subject: [PATCH v3 08/18] net: davinci_emac: potentially get the MAC address from MTD Date: Thu, 28 Jun 2018 16:32:34 +0200 Message-Id: <20180628143244.4561-9-brgl@bgdev.pl> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180628143244.4561-1-brgl@bgdev.pl> References: <20180628143244.4561-1-brgl@bgdev.pl> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180628_073331_548619_CAF3321E X-CRM114-Status: GOOD ( 17.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: netdev@vger.kernel.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski On da850-evm board we can read the MAC address from MTD. It's currently done in the relevant board file, but we want to get rid of all the MAC reading callbacks from the board file (SPI and NAND). Move the reading of the MAC address from SPI to the emac driver's probe function. Signed-off-by: Bartosz Golaszewski --- drivers/net/ethernet/ti/davinci_emac.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c index a1a6445b5a7e..17cfe093b8cf 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c @@ -67,7 +67,7 @@ #include #include #include - +#include #include #include @@ -1783,7 +1783,10 @@ static int davinci_emac_probe(struct platform_device *pdev) struct cpdma_params dma_params; struct clk *emac_clk; unsigned long emac_bus_frequency; - +#ifdef CONFIG_MTD + size_t mac_addr_len; + struct mtd_info *mtd; +#endif /* CONFIG_MTD */ /* obtain emac clock from kernel */ emac_clk = devm_clk_get(&pdev->dev, NULL); @@ -1815,6 +1818,18 @@ static int davinci_emac_probe(struct platform_device *pdev) goto err_free_netdev; } +#ifdef CONFIG_MTD + mtd = get_mtd_device_nm("MAC-Address"); + if (!IS_ERR(mtd)) { + rc = mtd_read(mtd, 0, ETH_ALEN, + &mac_addr_len, priv->mac_addr); + if (rc == 0) + dev_info(&pdev->dev, + "Read MAC addr from SPI Flash: %pM\n", + priv->mac_addr); + } +#endif /* CONFIG_MTD */ + /* 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;