From patchwork Wed May 11 06:30:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 620902 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 3r4R8F5VjSz9t5S for ; Wed, 11 May 2016 16:30:53 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=an/OGRK8; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751790AbcEKGas (ORCPT ); Wed, 11 May 2016 02:30:48 -0400 Received: from mail-pa0-f65.google.com ([209.85.220.65]:33430 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751136AbcEKGaq (ORCPT ); Wed, 11 May 2016 02:30:46 -0400 Received: by mail-pa0-f65.google.com with SMTP id gh9so2887436pac.0 for ; Tue, 10 May 2016 23:30:46 -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=UTWE0GJnpsLlwxdjc51Ve2TZivMcyAzFHuVEQqrW/To=; b=an/OGRK8eNSr+Db4u93fxWUyEnEVE56y8mdjQ2+7HUHqJ8XW+lqlZmd1vbaEhecCyU fo43VedOq7PLxwOzi9ehQkeLWyDTR6NCaZ2/WGGuHekuAd1iSF8Ooi14bZBy9eFlw7Qz q5EzRAWLzQVllD7E5LZ7zdxp+VqIWSE5gJyFM9YsxKGnSFtLO1899BAWcgQniwTesWB1 U7/z09tqqr0jJso8W1naxsv/WhF2hJF1Q+u/hrUF35iuTP9OlJQ1zez4XU2GPX/U9aNd WOxW33sN3Dm9bhrjTa+QK77G2NLuLuTGM/8qPIfWsCm9MMSSIoxRjiZaMlN3xtwVqEyl udCw== 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=UTWE0GJnpsLlwxdjc51Ve2TZivMcyAzFHuVEQqrW/To=; b=m727XG1tuyCf/bZT1YGzK9hJomPa3vQLxjiGLb/S/Imi78zIifFnbQ5bc9Vz1Bqt8a 2GDPGQOpcFSCIgzfejxqRwAklQEeR5FCcjh8dXX3NY+jedUnvf3XPFtRN4N4KF0XaJ+m 7Ba7anvK1PEobkMkOn+MIwets4yTRnFWbhsQO6w17DQ0XLI1v5IqqFi74vMg2BKKBmyb RDBGyvMmDffsKzyfLmrT1Hc+2GJq4uR+uLVL0a0GEFVsdgnHFKnH+Oqh57/JHAs93QS2 EEb10AoiahqYrVI0tSY5veh/X2AmLvYiN+WgEm58XAt78gLDVrxJOKvUIo9fbF3pbA2B 9mRQ== X-Gm-Message-State: AOPr4FUyzBjp1r7ZiqmYFJ3m6LlbdY4NBGCvcZDm2c5px267Q2Nk3jFCtpE4J7c4TM/+5Q== X-Received: by 10.67.14.7 with SMTP id fc7mr2250133pad.1.1462948246100; Tue, 10 May 2016 23:30:46 -0700 (PDT) Received: from localhost.localdomain ([240f:4:c2bc:1:35da:1eb8:fc70:2f52]) by smtp.gmail.com with ESMTPSA id 199sm9037274pfc.15.2016.05.10.23.30.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 May 2016 23:30:45 -0700 (PDT) From: Akinobu Mita To: netdev@vger.kernel.org Cc: Akinobu Mita , Mike Sinkovsky , "David S . Miller" Subject: [PATCH -next 4/4] net: w5100-spi: add support to specify MAC address by device tree Date: Wed, 11 May 2016 15:30:27 +0900 Message-Id: <1462948227-21276-5-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1462948227-21276-1-git-send-email-akinobu.mita@gmail.com> References: <1462948227-21276-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 --- 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 f649f1c..42e0a8d 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;