From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SqZqa-0004wr-AN for barebox@lists.infradead.org; Mon, 16 Jul 2012 01:11:43 +0000 Received: by pbbrq13 with SMTP id rq13so10398156pbb.36 for ; Sun, 15 Jul 2012 18:10:11 -0700 (PDT) From: Marc Reilly Date: Mon, 16 Jul 2012 11:04:55 +1000 Message-Id: <1342400699-6753-2-git-send-email-marc@cpdesign.com.au> In-Reply-To: <1342400699-6753-1-git-send-email-marc@cpdesign.com.au> References: <1342400699-6753-1-git-send-email-marc@cpdesign.com.au> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 1/5] imx_fec: Allow driver clients to supply MAC address To: barebox@lists.infradead.org This patch adds a handler to the fec platform data to get MAC address. If a handler is not specified the driver uses the existing one. Signed-off-by: Marc Reilly --- drivers/net/fec_imx.c | 6 +++++- include/fec.h | 4 ++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index 599a9b4..5084758 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -629,10 +629,14 @@ static int fec_probe(struct device_d *dev) edev->send = fec_send; edev->recv = fec_recv; edev->halt = fec_halt; - edev->get_ethaddr = fec_get_hwaddr; edev->set_ethaddr = fec_set_hwaddr; edev->parent = dev; + if (pdata->get_hwaddr) + edev->get_ethaddr = pdata->get_hwaddr; + else + edev->get_ethaddr = fec_get_hwaddr; + fec->regs = dev_request_mem_region(dev, 0); /* Reset chip. */ diff --git a/include/fec.h b/include/fec.h index f56b023..5072bbf 100644 --- a/include/fec.h +++ b/include/fec.h @@ -36,6 +36,8 @@ typedef enum { RGMII, } xceiver_type; +struct eth_device; + /* * Define the phy connected externally for FEC drivers * (like MPC52xx and i.MX27) @@ -43,6 +45,8 @@ typedef enum { struct fec_platform_data { xceiver_type xcv_type; int phy_addr; + + int (*get_hwaddr)(struct eth_device *dev, unsigned char *mac); }; #endif /* __INCLUDE_NETWORK_FEC_H */ -- 1.7.7 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox