From patchwork Sun Apr 24 21:28:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Heimpold X-Patchwork-Id: 614228 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 3qtMsz74lSz9t60 for ; Mon, 25 Apr 2016 07:28:39 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=heimpold.de header.i=@heimpold.de header.b=QCMGIZlo; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753318AbcDXV2i (ORCPT ); Sun, 24 Apr 2016 17:28:38 -0400 Received: from mo4-p00-ob.smtp.rzone.de ([81.169.146.219]:39594 "EHLO mo4-p00-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753124AbcDXV2g (ORCPT ); Sun, 24 Apr 2016 17:28:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1461533307; l=4218; s=domk; d=heimpold.de; h=References:In-Reply-To:Date:Subject:Cc:To:From; bh=2YB07zkjiyZb62I30Q3+L/M/8I4iNvTcXaNYqbaF2jE=; b=QCMGIZlongNp/sz+0jXXMiGi6WMsCa/kfmlxs9Ttfku5w9wWi/2YAhkH+bU+2JBb8Of JzbNaC1lEZ4aycWdLtCFM2xA8EWjhx9W2TGZtFi0uRRza/5LJG+RzdtjL7gJ5UsHITi67 UgkHeIJEt+0vs1kuxdKnuHVGJ1ynn6hjnng= X-RZG-AUTH: :O2kGeEG7b/pS1EW8QnKjhhg/vO4pzqdNys2z+NfqLSUoNNCTudAAFEJqC9JBN4NN7npmIA== X-RZG-CLASS-ID: mo00 Received: from tonne.mhei.heimpold.itr (p4FC8E44A.dip0.t-ipconnect.de [79.200.228.74]) by post.strato.de (RZmta 37.24 DYNA|AUTH) with ESMTPA id C01e97s3OLSLfIM; Sun, 24 Apr 2016 23:28:21 +0200 (CEST) Received: from kerker.fritz.box (kerker.mhei.heimpold.itr [192.168.8.1]) by tonne.mhei.heimpold.itr (Postfix) with ESMTP id 8C46424BA4; Sun, 24 Apr 2016 23:28:20 +0200 (CEST) From: Michael Heimpold To: Jonathan Cameron , "Andrew F . Davis" , Mark Brown , netdev@vger.kernel.org, devicetree@vger.kernel.org, Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala Cc: Michael Heimpold Subject: [PATCH v2 net-next] net: ethernet: enc28j60: add device tree support Date: Sun, 24 Apr 2016 23:28:03 +0200 Message-Id: <1461533283-24852-1-git-send-email-mhei@heimpold.de> X-Mailer: git-send-email 2.5.0 In-Reply-To: <31567588.rB9VrggOb6@wuerfel> References: <31567588.rB9VrggOb6@wuerfel> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The following patch adds the required match table for device tree support (and while at, fix the indent). It's also possible to specify the MAC address in the DT blob. Also add the corresponding binding documentation file. Signed-off-by: Michael Heimpold --- v2: * took care of Arnd Bergmann's review comments - allow to specify MAC address via DT - unconditionally define DT id table * increased the driver version minor number * driver author's email address bounces, removed from address list .../devicetree/bindings/net/microchip-enc28j60.txt | 50 ++++++++++++++++++++++ drivers/net/ethernet/microchip/enc28j60.c | 20 +++++++-- 2 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/microchip-enc28j60.txt diff --git a/Documentation/devicetree/bindings/net/microchip-enc28j60.txt b/Documentation/devicetree/bindings/net/microchip-enc28j60.txt new file mode 100644 index 0000000..847a97b --- /dev/null +++ b/Documentation/devicetree/bindings/net/microchip-enc28j60.txt @@ -0,0 +1,50 @@ +* Microchip ENC28J60 + +This is a standalone 10 MBit ethernet controller with SPI interface. + +For each device connected to a SPI bus, define a child node within +the SPI master node. + +Required properties: +- compatible: Should be "microchip,enc28j60" +- reg: Specify the SPI chip select the ENC28J60 is wired to +- interrupts: Specify the interrupt and interrupt type (usually falling edge) + +Optional properties: +- interrupt-parent: Specify the pHandle of the source interrupt +- spi-max-frequency: Maximum frequency of the SPI bus when accessing the ENC28J60. + According to the ENC28J80 datasheet, the chip allows a maximum of 20 MHz, however, + board designs may need to limit this value. +- local-mac-address: See ethernet.txt in the same directory. + + +Example (for NXP i.MX28 with pin control stuff for GPIO irq): + + ssp2: ssp@80014000 { + compatible = "fsl,imx28-spi"; + pinctrl-names = "default"; + pinctrl-0 = <&spi2_pins_b &spi2_sck_cfg>; + status = "okay"; + + enc28j60: ethernet@0 { + compatible = "microchip,enc28j60"; + pinctrl-names = "default"; + pinctrl-0 = <&enc28j60_pins>; + reg = <0>; + interrupt-parent = <&gpio3>; + interrupts = <3 IRQ_TYPE_EDGE_FALLING>; + spi-max-frequency = <12000000>; + }; + }; + + pinctrl@80018000 { + enc28j60_pins: enc28j60_pins@0 { + reg = <0>; + fsl,pinmux-ids = < + MX28_PAD_AUART0_RTS__GPIO_3_3 /* Interrupt */ + >; + fsl,drive-strength = ; + fsl,voltage = ; + fsl,pull-up = ; + }; + }; diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c index b723622..7066954 100644 --- a/drivers/net/ethernet/microchip/enc28j60.c +++ b/drivers/net/ethernet/microchip/enc28j60.c @@ -28,11 +28,12 @@ #include #include #include +#include #include "enc28j60_hw.h" #define DRV_NAME "enc28j60" -#define DRV_VERSION "1.01" +#define DRV_VERSION "1.02" #define SPI_OPLEN 1 @@ -1548,6 +1549,7 @@ static int enc28j60_probe(struct spi_device *spi) { struct net_device *dev; struct enc28j60_net *priv; + const void *macaddr; int ret = 0; if (netif_msg_drv(&debug)) @@ -1579,7 +1581,12 @@ static int enc28j60_probe(struct spi_device *spi) ret = -EIO; goto error_irq; } - eth_hw_addr_random(dev); + + macaddr = of_get_mac_address(spi->dev.of_node); + if (macaddr) + ether_addr_copy(dev->dev_addr, macaddr); + else + eth_hw_addr_random(dev); enc28j60_set_hw_macaddr(dev); /* Board setup must set the relevant edge trigger type; @@ -1634,9 +1641,16 @@ static int enc28j60_remove(struct spi_device *spi) return 0; } +static const struct of_device_id enc28j60_dt_ids[] = { + { .compatible = "microchip,enc28j60" }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, enc28j60_dt_ids); + static struct spi_driver enc28j60_driver = { .driver = { - .name = DRV_NAME, + .name = DRV_NAME, + .of_match_table = enc28j60_dt_ids, }, .probe = enc28j60_probe, .remove = enc28j60_remove,