From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753282AbbLEWUF (ORCPT ); Sat, 5 Dec 2015 17:20:05 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:57082 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753086AbbLEWUC (ORCPT ); Sat, 5 Dec 2015 17:20:02 -0500 From: Arnd Bergmann To: yankejian Cc: davem@davemloft.net, fengguang.wu@intel.com, robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, catalin.marinas@arm.com, will.deacon@arm.com, salil.mehta@huawei.com, Yisen.Zhuang@huawei.com, liguozhu@huawei.com, lisheng011@huawei.com, huangdaode@hisilicon.com, xuwei5@hisilicon.com, haifeng.wei@huawei.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH net-next 2/2] net: hns: enet specisies a reference to dsaf (config and documents) Date: Sat, 05 Dec 2015 23:19:04 +0100 Message-ID: <23027215.8RIhViTVaB@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1449295856-31068-3-git-send-email-yankejian@huawei.com> References: <1449295856-31068-1-git-send-email-yankejian@huawei.com> <1449295856-31068-3-git-send-email-yankejian@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:aCJlTjmdR7cxATGP42krXUt4Q7T9M9ZBEBtknEW112jfJWMrpp9 JO6jJ70SbXFXCGBZyHdziW/aOwf0VWDKeOFey0W49QzuE3n75uV0QgtrcWABfrrdL8vL9p+ tviU6LV/oG/bIYYq/xefLlJDLPoXzEqmBztfIknl0muqdCw50G+4PubUpzz46Fyi8Csu8zj 7QPzPVnyfBqu4Rosrdd7g== X-UI-Out-Filterresults: notjunk:1;V01:K0:8agCDTG7OOs=:rrx9voKumwdU90t5E2+F2t bq9S/58Bo6Fa+6bKT9R6UdBVYVZw6peRa0six1f+A5c8IOQWmh3sVvPlGabQbqF77aVx3h4qF BtxO+ag9Hx1XkTq2yGbXgRXBYkog1A3Oe31KXBxIoYv4BdiLTumb3QYe6eIVy97nX9weL7eUh /1zH5cz9bRfXSxeWGg/HxB/KWzsRQIJrLfDunaGxxBoX+gxpavuvuS00eYR8ZwqDMVQ0sV0zK wLu474BFbn9mCLK2XBPN49BK1IMc5U1Yp6VL+m+mEuKgUxMhpfMJXuen7PQHch3S0OGewoMRW 9zLp5o/VRefcwE4bimhA/ulZOFQyh0H5jAd7Cap7RGJwC+2xIXQf69fRKQfY9cD9kISzcHr0x 8snD9Q1nTi8HGwGX1VmS+lyesfjC2TE69NBTwCn7MTvCI+xORU1q6BoIhsxQxCVy1ftC9wlqI C3UEj0ahNN8uD/db/ZcnnkE1eLlCarSbdi/fGQCSQpLAauuW48wsUpVbH2892OJMxtilKMAr4 fFNzbi6AbWbT2Yhr7trAUVgvx/ygpcpOhuBBWK38rCSR+r4aF2vCXP4ppQOwPPoCX4cKF4xW0 6aEvdpB3mkiBXWE7Yj6e+a7TsYzxuXAE1FLJucwhdxlWrx6ptIlgo72hV2zZ1HmGABvrEAcHl 92aoIuUBbuNgbh9LnzmZl0T7DPqspCno3nxeDgx1zEvXSBheoKfTfR7xLiyEgONA6miYuJioM c56ThPf6wyRbDEZw Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Saturday 05 December 2015 14:10:56 yankejian wrote: > diff --git a/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt b/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt > index 80411b2..ecacfa4 100644 > --- a/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt > +++ b/Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt > @@ -4,8 +4,6 @@ Required properties: > - compatible: should be "hisilicon,hns-dsaf-v1" or "hisilicon,hns-dsaf-v2". > "hisilicon,hns-dsaf-v1" is for hip05. > "hisilicon,hns-dsaf-v2" is for Hi1610 and Hi1612. > -- dsa-name: dsa fabric name who provide this interface. > - should be "dsafX", X is the dsaf id. > - mode: dsa fabric mode string. only support one of dsaf modes like these: > "2port-64vf", > "6port-16rss", > @@ -26,9 +24,8 @@ Required properties: > > Example: > > -dsa: dsa@c7000000 { > +dsaf0: dsa@c7000000 { > compatible = "hisilicon,hns-dsaf-v1"; > - dsa_name = "dsaf0"; > mode = "6port-16rss"; > interrupt-parent = <&mbigen_dsa>; > reg = <0x0 0xC0000000 0x0 0x420000 > diff --git a/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt b/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt > index 41d19be..e6a9d1c 100644 > --- a/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt > +++ b/Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt > @@ -4,8 +4,9 @@ Required properties: > - compatible: "hisilicon,hns-nic-v1" or "hisilicon,hns-nic-v2". > "hisilicon,hns-nic-v1" is for hip05. > "hisilicon,hns-nic-v2" is for Hi1610 and Hi1612. > -- ae-name: accelerator name who provides this interface, > - is simply a name referring to the name of name in the accelerator node. > +- ae-handle: accelerator engine handle for hns, > + specifies a reference to the associating hardware driver node. > + see Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt > - port-id: is the index of port provided by DSAF (the accelerator). DSAF can > connect to 8 PHYs. Port 0 to 1 are both used for adminstration purpose. They > are called debug ports. > @@ -41,7 +42,7 @@ Example: > > This looks like an incompatible change, as you add and remove required properties. Is there a way to support both the old and the new style? Arnd