From patchwork Thu Jan 5 10:23:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greentime Hu X-Patchwork-Id: 711329 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 3tvPZ01yblz9t1B for ; Thu, 5 Jan 2017 21:49:12 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qCWOH3+V"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761456AbdAEKsx (ORCPT ); Thu, 5 Jan 2017 05:48:53 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:32988 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751941AbdAEKst (ORCPT ); Thu, 5 Jan 2017 05:48:49 -0500 Received: by mail-pg0-f67.google.com with SMTP id g1so40373318pgn.0; Thu, 05 Jan 2017 02:48:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:mime-version:content-disposition :user-agent; bh=sJklhw/dy2ZmyfdB482r2SqstdGrSfASfUmXZLSB3L0=; b=qCWOH3+VQFKbMQGrcJ1YMnhk7peb3Zc290qzBpljeSzvsTGKlIcVBkbFjto25GIh3w LU586CRttqf+PPdMolufTd2CFOJVbKiYCqbBTHiyD/qE5siRX+qbk738bACyh5gQF6xE JJYYQS+3lr9HbdzPBgrWSE+hBf7UYpwhlfuZQhRqipOGQjvt41xXQa2K23h/JMR6LAQe qDQsdKEF/3up+M2fAuvofGOtHgUAYYPcZBrOuAHDqzC2Nd3iHUAb5MH/5VR3b/UTNeTr Vwpf2dwc9XRKgJB0ollwYF8fz2KdIN9dZq2aYSqHJkSs0Us9wiNd9fXgBKVGdg99/Jfz isXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=sJklhw/dy2ZmyfdB482r2SqstdGrSfASfUmXZLSB3L0=; b=gCvkt97++Yc6m+xB0PutMLprVDsNe8jr0bg4TY7UvSU7bEE27iGKlqMvhmHYIYr8lc Fc0QwlHkehu451M+a7BKKWhxaqqtWX6ZCpeKa6pxjLLNR6WBfgQ90+5cFWymgrUXc9Wa OkWapBL2cajKdLUO42RTTcrMmBRhe8kayOstSZJuFdTZOMbKlKfAi0orafAByZD/zBUV 5M2sRg7UzjDO+4jOCjjwthN3eA5F9mrioMtbgW4Q2f/Yp0+X4FAyO3no3TaAxVtk1bBv I62398Jt/qnQbKXRQCzlo82KfPvQ8kPPunVLDenMVnri2UplsjWFNTK0llPv4IsjObS7 XT4A== X-Gm-Message-State: AIkVDXIQN6l6TuqihIrEnMvq2bCnBdJjrfCal7sZsij44KqQjMT67/z4Rn5xuH2E6XOe6A== X-Received: by 10.99.246.5 with SMTP id m5mr133303110pgh.9.1483613328819; Thu, 05 Jan 2017 02:48:48 -0800 (PST) Received: from app09 ([118.163.51.199]) by smtp.gmail.com with ESMTPSA id r68sm143448665pfk.85.2017.01.05.02.48.45 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Thu, 05 Jan 2017 02:48:47 -0800 (PST) Date: Thu, 5 Jan 2017 18:23:53 +0800 From: Greentime Hu To: f.fainelli@gmail.com, netdev@vger.kernel.org, devicetree@vger.kernel.org, andrew@lunn.ch, linux-kernel@vger.kernel.org, jiri@resnulli.us, jonas.jensen@gmail.com, davem@davemloft.net, arnd@arndb.de Subject: [PATCH v4] net: ethernet: faraday: To support device tree usage. Message-ID: <20170105102345.GA25774@app09> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Greentime Hu --- Changes in v4: - Use the same binding document to describe the same faraday ethernet controller and add faraday to vendor-prefixes.txt. Changes in v3: - Nothing changed in this patch but I have committed andestech to vendor-prefixes.txt. Changes in v2: - Change atmac100_of_ids to ftmac100_of_ids --- .../net/{moxa,moxart-mac.txt => faraday,ftmac.txt} | 7 +++++-- .../devicetree/bindings/vendor-prefixes.txt | 1 + drivers/net/ethernet/faraday/ftmac100.c | 7 +++++++ 3 files changed, 13 insertions(+), 2 deletions(-) rename Documentation/devicetree/bindings/net/{moxa,moxart-mac.txt => faraday,ftmac.txt} (68%) diff --git a/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt b/Documentation/devicetree/bindings/net/faraday,ftmac.txt similarity index 68% rename from Documentation/devicetree/bindings/net/moxa,moxart-mac.txt rename to Documentation/devicetree/bindings/net/faraday,ftmac.txt index 583418b..be4f55e 100644 --- a/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt +++ b/Documentation/devicetree/bindings/net/faraday,ftmac.txt @@ -1,8 +1,11 @@ -MOXA ART Ethernet Controller +Faraday Ethernet Controller Required properties: -- compatible : Must be "moxa,moxart-mac" +- compatible : Must contain "faraday,ftmac", as well as one of + the SoC specific identifiers: + "andestech,atmac100" + "moxa,moxart-mac" - reg : Should contain register location and length - interrupts : Should contain the mac interrupt number diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 16d3b5e..489c336 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -102,6 +102,7 @@ everest Everest Semiconductor Co. Ltd. everspin Everspin Technologies, Inc. excito Excito ezchip EZchip Semiconductor +faraday Faraday Technology Corporation fcs Fairchild Semiconductor firefly Firefly focaltech FocalTech Systems Co.,Ltd diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c index dce5f7b..5d70ee9 100644 --- a/drivers/net/ethernet/faraday/ftmac100.c +++ b/drivers/net/ethernet/faraday/ftmac100.c @@ -1172,11 +1172,17 @@ static int __exit ftmac100_remove(struct platform_device *pdev) return 0; } +static const struct of_device_id ftmac100_of_ids[] = { + { .compatible = "andestech,atmac100" }, + { } +}; + static struct platform_driver ftmac100_driver = { .probe = ftmac100_probe, .remove = __exit_p(ftmac100_remove), .driver = { .name = DRV_NAME, + .of_match_table = ftmac100_of_ids }, }; @@ -1200,3 +1206,4 @@ static void __exit ftmac100_exit(void) MODULE_AUTHOR("Po-Yu Chuang "); MODULE_DESCRIPTION("FTMAC100 driver"); MODULE_LICENSE("GPL"); +MODULE_DEVICE_TABLE(of, ftmac100_of_ids);