From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932736AbcLMCHG (ORCPT ); Mon, 12 Dec 2016 21:07:06 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:53157 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753347AbcLMCHE (ORCPT ); Mon, 12 Dec 2016 21:07:04 -0500 Subject: Re: [PATCH v2 1/4] net: hix5hd2_gmac: add generic compatible string To: Rob Herring References: <1480944481-118803-1-git-send-email-lidongpo@hisilicon.com> <1480944481-118803-2-git-send-email-lidongpo@hisilicon.com> <20161209223521.5dnj7l44e663sntl@rob-hp-laptop> <584E871D.7060200@hisilicon.com> CC: Mark Rutland , Michael Turquette , Stephen Boyd , Russell King , Zhangfei Gao , Yisen Zhuang , , David Miller , Arnd Bergmann , Andrew Lunn , Jiancheng Xue , , , netdev , "devicetree@vger.kernel.org" , "linux-kernel@vger.kernel.org" From: Dongpo Li Message-ID: <584F56B6.60905@hisilicon.com> Date: Tue, 13 Dec 2016 10:02:30 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.66.52.107] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2016/12/12 22:21, Rob Herring wrote: > On Mon, Dec 12, 2016 at 5:16 AM, Dongpo Li wrote: >> Hi Rob, >> >> On 2016/12/10 6:35, Rob Herring wrote: >>> On Mon, Dec 05, 2016 at 09:27:58PM +0800, Dongpo Li wrote: >>>> The "hix5hd2" is SoC name, add the generic ethernet driver name. >>>> The "hisi-gemac-v1" is the basic version and "hisi-gemac-v2" adds >>>> the SG/TXCSUM/TSO/UFO features. >>>> >>>> Signed-off-by: Dongpo Li >>>> --- >>>> .../devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt | 9 +++++++-- >>>> drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 15 +++++++++++---- >>>> 2 files changed, 18 insertions(+), 6 deletions(-) >>>> >>>> diff --git a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt >>>> index 75d398b..75920f0 100644 >>>> --- a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt >>>> +++ b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt >>>> @@ -1,7 +1,12 @@ >>>> Hisilicon hix5hd2 gmac controller >>>> >>>> Required properties: >>>> -- compatible: should be "hisilicon,hix5hd2-gmac". >>>> +- compatible: should contain one of the following SoC strings: >>>> + * "hisilicon,hix5hd2-gemac" >>>> + * "hisilicon,hi3798cv200-gemac" >>>> + and one of the following version string: >>>> + * "hisilicon,hisi-gemac-v1" >>>> + * "hisilicon,hisi-gemac-v2" >>> >>> What combinations are valid? I assume both chips don't have both v1 and >>> v2. 2 SoCs and 2 versions so far, I don't think there is much point to >>> have the v1 and v2 compatible strings. >>> >> The v1 and v2 are generic MAC compatible strings, many HiSilicon SoCs may >> use the same MAC version. For example, >> hix5hd2, hi3716cv200 SoCs use the v1 MAC version, >> hi3798cv200, hi3516a SoCs use the v2 MAC version, >> and there may be more SoCs added in future. >> So I think the generic compatible strings are okay here. >> Should I add the hi3716cv200, hi3516a SoCs compatible here? > > Yes. > >> Do you have any good advice? >> >>>> - reg: specifies base physical address(s) and size of the device registers. >>>> The first region is the MAC register base and size. >>>> The second region is external interface control register. >>>> @@ -20,7 +25,7 @@ Required properties: >>>> >>>> Example: >>>> gmac0: ethernet@f9840000 { >>>> - compatible = "hisilicon,hix5hd2-gmac"; >>>> + compatible = "hisilicon,hix5hd2-gemac", "hisilicon,hisi-gemac-v1"; >>> >>> You can't just change compatible strings. >>> >> Okay, maybe I should name all the compatible string with the suffix "-gmac" instead of >> "-gemac". This can keep the compatible strings with the same suffix. Is this okay? >> Can I just add the generic compatible string without changing the SoCs compatible string? >> Like following: >> gmac0: ethernet@f9840000 { >> - compatible = "hisilicon,hix5hd2-gmac"; >> + compatible = "hisilicon,hix5hd2-gmac", "hisilicon,hisi-gmac-v1"; > > Yes, this is fine. > Many thanks for your advice. As the patch series have been applied to net-next branch, in which way should I commit this compatible fix? Should I send a new patch with "Fixes: xxxx"? Regards, Dongpo .