From patchwork Sat May 14 05:55:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 622197 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3r6GFY1vNLz9t62 for ; Sat, 14 May 2016 15:56:49 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=TfdZa+5T; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751934AbcENF4n (ORCPT ); Sat, 14 May 2016 01:56:43 -0400 Received: from mail-pa0-f65.google.com ([209.85.220.65]:35008 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751735AbcENF4k (ORCPT ); Sat, 14 May 2016 01:56:40 -0400 Received: by mail-pa0-f65.google.com with SMTP id zy2so11786958pac.2 for ; Fri, 13 May 2016 22:56:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OuKhweDfD9sBCFImT3avx2ciPg3OutbMWQUpS49ICSc=; b=TfdZa+5TaCAITcduksZm1kxQYwI2+J0BPf2nl3DZflNbLUU4NnbSOXdoZu3B1zJcGN lE3wJSOgcEp956N5n1e7nXULri25rnYnIf/b2fs//j/nrYYFdcB5IsHrFUjDciwPytfB 3k7S7JeQGPEi77G9JUJUdIJ9SVY9Iln2A73V08QosMpL+h2sDYiOJ+ULGMB5UqQ4VSXG g7k/4tGgefREN+2GVvC7vHnsLJRWEIq27aKwJmuhB1s/3usfRbO9wgKWyr2vcb4Jiddc gechxTk7I1cb4fhCSwosttJFRt01zwqXPSgUxh9IjdlYEJzkE00dwaLm9X2iQMLxI441 m6Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OuKhweDfD9sBCFImT3avx2ciPg3OutbMWQUpS49ICSc=; b=G4VZav7sWZfDk4i2QCq9p95uFfctrJJH5jpGTSSh4Y7tiGvJ9js1pLj0RmWi4/Svan sbvKgo4ldZ7JLHjOeFyY+s5yTwYV7RbRAFDeoPfsSQrj+5YeNMGmbT6PV+HHzSnEAXpI vQo/z9t4oztMbdssUuCK28iuxpQxpog5yZaGaZ/T+IEJJ2I8kLdv25Ayr5a3YRu+e2R6 c1i274r4/6HrjTqNneiZh9hH0NPtDbDLht4Vu7v3xG28Cqm1yZweEzQ7I27srirssTd5 CquTagtKlaIZiXFQdbu5dEe2zmF+XrcTX6g7YrtHg/AdYFmW5lM5l+vY88HDfNLkcUuQ HfTQ== X-Gm-Message-State: AOPr4FUq2k4UaMfR5qrFcY4SrXIPPBSh971qtrOLYrqOsj83jZnRzZUHXnNUVztuN2AIxA== X-Received: by 10.66.254.1 with SMTP id ae1mr28931675pad.32.1463205399508; Fri, 13 May 2016 22:56:39 -0700 (PDT) Received: from localhost.localdomain ([240f:4:c2bc:1:e521:2a1e:1cf3:ec2]) by smtp.gmail.com with ESMTPSA id a14sm31452372pfc.57.2016.05.13.22.56.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 May 2016 22:56:39 -0700 (PDT) From: Akinobu Mita To: netdev@vger.kernel.org Cc: Akinobu Mita , Mike Sinkovsky , "David S . Miller" Subject: [PATCH -next v2 4/4] net: w5100-spi: add support to specify MAC address by device tree Date: Sat, 14 May 2016 14:55:50 +0900 Message-Id: <1463205350-7089-5-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1463205350-7089-1-git-send-email-akinobu.mita@gmail.com> References: <1463205350-7089-1-git-send-email-akinobu.mita@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This adds support to specify the MAC address by 'mac-address' or 'local-mac-address' properties in the device tree. These are common properties for the Ethernet controller. Signed-off-by: Akinobu Mita Cc: Mike Sinkovsky Cc: David S. Miller --- * No changes from v1 drivers/net/ethernet/wiznet/w5100-spi.c | 4 +++- drivers/net/ethernet/wiznet/w5100.c | 5 +++-- drivers/net/ethernet/wiznet/w5100.h | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/wiznet/w5100-spi.c b/drivers/net/ethernet/wiznet/w5100-spi.c index b868e45..93a2d3c 100644 --- a/drivers/net/ethernet/wiznet/w5100-spi.c +++ b/drivers/net/ethernet/wiznet/w5100-spi.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include "w5100.h" @@ -414,6 +415,7 @@ static int w5100_spi_probe(struct spi_device *spi) const struct spi_device_id *id = spi_get_device_id(spi); const struct w5100_ops *ops; int priv_size; + const void *mac = of_get_mac_address(spi->dev.of_node); switch (id->driver_data) { case W5100: @@ -432,7 +434,7 @@ static int w5100_spi_probe(struct spi_device *spi) return -EINVAL; } - return w5100_probe(&spi->dev, ops, priv_size, NULL, spi->irq, -EINVAL); + return w5100_probe(&spi->dev, ops, priv_size, mac, spi->irq, -EINVAL); } static int w5100_spi_remove(struct spi_device *spi) diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c index 43fdf88..e9ae7e6 100644 --- a/drivers/net/ethernet/wiznet/w5100.c +++ b/drivers/net/ethernet/wiznet/w5100.c @@ -1052,7 +1052,7 @@ static const struct net_device_ops w5100_netdev_ops = { static int w5100_mmio_probe(struct platform_device *pdev) { struct wiznet_platform_data *data = dev_get_platdata(&pdev->dev); - u8 *mac_addr = NULL; + const void *mac_addr = NULL; struct resource *mem; const struct w5100_ops *ops; int irq; @@ -1087,7 +1087,8 @@ void *w5100_ops_priv(const struct net_device *ndev) EXPORT_SYMBOL_GPL(w5100_ops_priv); int w5100_probe(struct device *dev, const struct w5100_ops *ops, - int sizeof_ops_priv, u8 *mac_addr, int irq, int link_gpio) + int sizeof_ops_priv, const void *mac_addr, int irq, + int link_gpio) { struct w5100_priv *priv; struct net_device *ndev; diff --git a/drivers/net/ethernet/wiznet/w5100.h b/drivers/net/ethernet/wiznet/w5100.h index f8a16fa..17983a3 100644 --- a/drivers/net/ethernet/wiznet/w5100.h +++ b/drivers/net/ethernet/wiznet/w5100.h @@ -30,7 +30,8 @@ struct w5100_ops { void *w5100_ops_priv(const struct net_device *ndev); int w5100_probe(struct device *dev, const struct w5100_ops *ops, - int sizeof_ops_priv, u8 *mac_addr, int irq, int link_gpio); + int sizeof_ops_priv, const void *mac_addr, int irq, + int link_gpio); int w5100_remove(struct device *dev); extern const struct dev_pm_ops w5100_pm_ops;